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

Fixes for detecting standard library

Browse source
This commit is contained in:
flithm 2007-08-29 11:35:50 +00:00
parent c315c3f0d3
commit 4889158b84
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmaked/CMakeDInformation.cmake
View file

@ -142,7 +142,7 @@ ELSE(CMAKE_COMPILER_IS_GDC)
SET(CMAKE_LIBRARY_PATH_FLAG "-L")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC)
IF(CMAKE_D_USE_TANGO)
IF(CMAKE_COMPILER_IS_GDC)
SET(DSTDLIB_TYPE "-fversion=Tango")

6
cmaked/CMakeTestDCompiler.cmake
View file

@ -158,6 +158,12 @@ ELSE(NOT CMAKE_D_TANGO_WORKS)
ENDIF(C_TEST_WAS_RUN)
SET(CMAKE_D_TANGO_WORKS 1 CACHE INTERNAL "")
ENDIF(NOT CMAKE_D_TANGO_WORKS)
# if both tango and phobos are selected try to choose which one is available
IF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
MESSAGE(FATAL_ERROR "Tango AND Phobos selected, please choose one or the other!")
ENDIF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
# ensure the user has the appropriate std lib available
IF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!")