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

Fixed static library and C++/D link error (Optlink requires .obj for C and D files not just D)

Browse source 
Now passes all cmaked2 tests on windows using DMD (tested DMD2 only)
This commit is contained in:
Deano Calver dean. 2010-09-04 19:20:44 +01:00
parent fa06b40600
commit 4331f9ad6b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmaked/CMakeDInformation.cmake
View file

@ -29,6 +29,7 @@ IF(CMAKE_D_COMPILER_ID)
ENDIF(CMAKE_D_COMPILER_ID)
# SET(CMAKE_D_OUTPUT_EXTENSION .o)
SET(CMAKE_C_OUTPUT_EXTENSION_REPLACE TRUE )
SET(CMAKE_D_OUTPUT_EXTENSION_REPLACE TRUE )
SET(CMAKE_BASE_NAME)
@ -165,6 +166,11 @@ ENDIF(NOT CMAKE_D_CREATE_SHARED_LIBRARY)
IF(NOT CMAKE_D_CREATE_SHARED_MODULE)
SET(CMAKE_D_CREATE_SHARED_MODULE ${CMAKE_D_CREATE_SHARED_LIBRARY})
ENDIF(NOT CMAKE_D_CREATE_SHARED_MODULE)
IF(NOT CMAKE_D_CREATE_STATIC_LIBRARY)
SET(CMAKE_D_CREATE_STATIC_LIBRARY
"<CMAKE_D_COMPILER> -lib -v <OBJECTS> ${CMAKE_D_DASH_O}<TARGET>")
ENDIF(NOT CMAKE_D_CREATE_STATIC_LIBRARY)
# Create a static archive incrementally for large object file counts.
# If CMAKE_D_CREATE_STATIC_LIBRARY is set it will override these.