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

No longer need to force 32-bit output on Linux with dmd 2.053. Tested on Fedora 14 64-bit.

Browse source
This commit is contained in:
Unknown 2011-05-18 21:50:07 -07:00
parent b45cb56015
commit 1eb5119782
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.hgignore
View file

@ -1,3 +1,5 @@
.*\.cbp .*\.cbp
.*\.layout .*\.layout
.*\.swp .*\.swp
build_tests\.*
build\.*

8
tests/app_5/CMakeLists.txt
View file

@ -6,8 +6,10 @@
# TODO # TODO
# dirty fix # dirty fix
# we should make the CMAKE_D_COMPILER_ID work # we should make the CMAKE_D_COMPILER_ID work
IF("${CMAKE_BASE_NAME}" MATCHES "dmd") #
SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) # This 32-bit environment check no longer needed as of dmd 2.053 on Linux
ENDIF() #IF("${CMAKE_BASE_NAME}" MATCHES "dmd")
# SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" )
#ENDIF()
ADD_EXECUTABLE ( app_5 app_5.d cfunc.c ) ADD_EXECUTABLE ( app_5 app_5.d cfunc.c )
ADD_TEST( app_5 app_5 ) ADD_TEST( app_5 app_5 )

8
tests/lib_2/CMakeLists.txt
View file

@ -3,7 +3,9 @@ PROJECT( lib_2 C )
# TODO # TODO
# dirty fix # dirty fix
# we should make the CMAKE_D_COMPILER_ID work # we should make the CMAKE_D_COMPILER_ID work
IF("${CMAKE_BASE_NAME}" MATCHES "dmd") #
SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) # This 32-bit environment check no longer needed as of dmd 2.053 on Linux
ENDIF() #IF("${CMAKE_BASE_NAME}" MATCHES "dmd")
# SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" )
#ENDIF()
ADD_LIBRARY( lib_2 STATIC lib_2.c ) ADD_LIBRARY( lib_2 STATIC lib_2.c )