From bd19bcacf4a13a1e9353806bcd724fad01014ec9 Mon Sep 17 00:00:00 2001 From: flithm Date: Tue, 28 Aug 2007 16:09:19 +0000 Subject: [PATCH] Final round of windows fixes -- almost fully working. The problem is the dmd linker requires a trailing slash on the end for link library paths, and cmake strips them. I've sent a message to the cmake mailing list asking for help on this. --- cmaked/CMakeDInformation.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmaked/CMakeDInformation.cmake b/cmaked/CMakeDInformation.cmake index 47d76b1..f9135fe 100644 --- a/cmaked/CMakeDInformation.cmake +++ b/cmaked/CMakeDInformation.cmake @@ -128,8 +128,10 @@ ELSE(CMAKE_COMPILER_IS_GDC) SET(CMAKE_OUTPUT_D_FLAG "-of") SET(CMAKE_D_VERSION_FLAG "-version=") IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + SET(CMAKE_INCLUDE_FLAG_D "-I") # -I + SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty SET(CMAKE_LINK_LIBRARY_FLAG "-L+") - SET(CMAKE_LIBRARY_PATH_FLAG "-I") + SET(CMAKE_LIBRARY_PATH_FLAG "-L+") FIND_PROGRAM(DMD_LIBRARIAN "lib.exe") ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") SET(CMAKE_SHARED_LIBRARY_D_FLAGS "-fPIC") @@ -137,7 +139,6 @@ ELSE(CMAKE_COMPILER_IS_GDC) SET(CMAKE_INCLUDE_FLAG_D "-I") # -I SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty SET(CMAKE_LIBRARY_PATH_FLAG "-L") - SET(CMAKE_LINK_LIBRARY_FLAG "-l") ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ENDIF(CMAKE_COMPILER_IS_GDC)