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

More windows fixes

Browse source
This commit is contained in:
flithm 2007-08-28 11:19:05 +00:00
parent a81ea73566
commit 30c8f9774d
4 changed files with 451 additions and 441 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmaked/CMakeDInformation.cmake
View file

@ -126,6 +126,7 @@ IF(CMAKE_COMPILER_IS_GDC)
SET(CMAKE_D_VERSION_FLAG "-fversion=") SET(CMAKE_D_VERSION_FLAG "-fversion=")
ELSE(CMAKE_COMPILER_IS_GDC) ELSE(CMAKE_COMPILER_IS_GDC)
SET(CMAKE_OUTPUT_D_FLAG "-of") SET(CMAKE_OUTPUT_D_FLAG "-of")
SET(CMAKE_D_VERSION_FLAG "-version=")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
SET(CMAKE_LINK_LIBRARY_FLAG "-L+") SET(CMAKE_LINK_LIBRARY_FLAG "-L+")
SET(CMAKE_LIBRARY_PATH_FLAG "-I") SET(CMAKE_LIBRARY_PATH_FLAG "-I")
@ -137,7 +138,6 @@ ELSE(CMAKE_COMPILER_IS_GDC)
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") SET(CMAKE_LINK_LIBRARY_FLAG "-l")
SET(CMAKE_D_VERSION_FLAG "-version=")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC) ENDIF(CMAKE_COMPILER_IS_GDC)

18
cmaked/CMakeTestDCompiler.cmake
View file

@ -84,10 +84,15 @@ IF(NOT CMAKE_D_PHOBOS_WORKS)
CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos" CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
ELSE(CMAKE_COMPILER_IS_GDC) ELSE(CMAKE_COMPILER_IS_GDC)
TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a" TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import" OUTPUT_VARIABLE OUTPUT)
OUTPUT_VARIABLE OUTPUT) ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
OUTPUT_VARIABLE OUTPUT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC) ENDIF(CMAKE_COMPILER_IS_GDC)
SET(C_TEST_WAS_RUN 1) SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_PHOBOS_WORKS) ENDIF(NOT CMAKE_D_PHOBOS_WORKS)
@ -119,10 +124,15 @@ IF(NOT CMAKE_D_TANGO_WORKS)
CMAKE_FLAGS "-DLINK_LIBRARIES=gtango" CMAKE_FLAGS "-DLINK_LIBRARIES=gtango"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
ELSE(CMAKE_COMPILER_IS_GDC) ELSE(CMAKE_COMPILER_IS_GDC)
IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
OUTPUT_VARIABLE OUTPUT)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a" CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a"
COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import" COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC) ENDIF(CMAKE_COMPILER_IS_GDC)
SET(C_TEST_WAS_RUN 1) SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_TANGO_WORKS) ENDIF(NOT CMAKE_D_TANGO_WORKS)

2
cmaked/Platform/Windows-dmd.cmake
View file

@ -25,7 +25,7 @@ IF(CMAKE_D_BUILD_DOCS)
#ENDFOREACH(item) #ENDFOREACH(item)
ENDIF(CMAKE_D_BUILD_DOCS) ENDIF(CMAKE_D_BUILD_DOCS)
SET (CMAKE_D_FLAGS_INIT "-version=Posix ${DSTDLIB_FLAGS} -I$ENV{D_PATH}/include -I$ENV{D_PATH}/import") SET (CMAKE_D_FLAGS_INIT "-version=Win ${DSTDLIB_FLAGS}")
SET (CMAKE_D_FLAGS_DEBUG_INIT "-g ${DDOC_FLAGS}") SET (CMAKE_D_FLAGS_DEBUG_INIT "-g ${DDOC_FLAGS}")
# SET (CMAKE_D_FLAGS_MINSIZEREL_INIT "-Os ${DDOC_FLAGS}") # SET (CMAKE_D_FLAGS_MINSIZEREL_INIT "-Os ${DDOC_FLAGS}")
SET (CMAKE_D_FLAGS_RELEASE_INIT "-O -release -inline ${DDOC_FLAGS}") SET (CMAKE_D_FLAGS_RELEASE_INIT "-O -release -inline ${DDOC_FLAGS}")

2
cmaked/Platform/Windows-gdc.cmake
View file

@ -25,7 +25,7 @@ IF(CMAKE_D_BUILD_DOCS)
ENDFOREACH(item) ENDFOREACH(item)
ENDIF(CMAKE_D_BUILD_DOCS) ENDIF(CMAKE_D_BUILD_DOCS)
SET (CMAKE_D_FLAGS_INIT "-fversion=Posix ${DSTDLIB_FLAGS}") SET (CMAKE_D_FLAGS_INIT "-fversion=Win ${DSTDLIB_FLAGS}")
SET (CMAKE_D_FLAGS_DEBUG_INIT "-g ${DDOC_FLAGS}") SET (CMAKE_D_FLAGS_DEBUG_INIT "-g ${DDOC_FLAGS}")
SET (CMAKE_D_FLAGS_MINSIZEREL_INIT "-Os ${DDOC_FLAGS}") SET (CMAKE_D_FLAGS_MINSIZEREL_INIT "-Os ${DDOC_FLAGS}")
SET (CMAKE_D_FLAGS_RELEASE_INIT "-O3 -fomit-frame-pointer -fweb -frelease -finline-functions ${DDOC_FLAGS}") SET (CMAKE_D_FLAGS_RELEASE_INIT "-O3 -fomit-frame-pointer -fweb -frelease -finline-functions ${DDOC_FLAGS}")