King_DuckZ/cmake-d
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Final round of windows fixes -- almost fully working.

Browse source 
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.
This commit is contained in:
flithm 2007-08-28 16:09:19 +00:00
parent 1c00666500
commit bd19bcacf4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmaked/CMakeDInformation.cmake
View file

@ -128,8 +128,10 @@ ELSE(CMAKE_COMPILER_IS_GDC)
SET(CMAKE_OUTPUT_D_FLAG "-of") SET(CMAKE_OUTPUT_D_FLAG "-of")
SET(CMAKE_D_VERSION_FLAG "-version=") SET(CMAKE_D_VERSION_FLAG "-version=")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") 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_LINK_LIBRARY_FLAG "-L+")
SET(CMAKE_LIBRARY_PATH_FLAG "-I") SET(CMAKE_LIBRARY_PATH_FLAG "-L+")
FIND_PROGRAM(DMD_LIBRARIAN "lib.exe") FIND_PROGRAM(DMD_LIBRARIAN "lib.exe")
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
SET(CMAKE_SHARED_LIBRARY_D_FLAGS "-fPIC") 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 "-I") # -I
SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty
SET(CMAKE_LIBRARY_PATH_FLAG "-L") SET(CMAKE_LIBRARY_PATH_FLAG "-L")
SET(CMAKE_LINK_LIBRARY_FLAG "-l")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC) ENDIF(CMAKE_COMPILER_IS_GDC)