From 1eb5119782cd968fa2d0d24a9175c3e4c0e12200 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 18 May 2011 21:50:07 -0700 Subject: [PATCH] No longer need to force 32-bit output on Linux with dmd 2.053. Tested on Fedora 14 64-bit. --- .hgignore | 2 ++ tests/app_5/CMakeLists.txt | 8 +++++--- tests/lib_2/CMakeLists.txt | 8 +++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.hgignore b/.hgignore index 83af5f8..fe19fd8 100644 --- a/.hgignore +++ b/.hgignore @@ -1,3 +1,5 @@ .*\.cbp .*\.layout .*\.swp +build_tests\.* +build\.* diff --git a/tests/app_5/CMakeLists.txt b/tests/app_5/CMakeLists.txt index 59dc726..6f6938a 100644 --- a/tests/app_5/CMakeLists.txt +++ b/tests/app_5/CMakeLists.txt @@ -6,8 +6,10 @@ # TODO # dirty fix # we should make the CMAKE_D_COMPILER_ID work -IF("${CMAKE_BASE_NAME}" MATCHES "dmd") - SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) -ENDIF() +# +# This 32-bit environment check no longer needed as of dmd 2.053 on Linux +#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_TEST( app_5 app_5 ) diff --git a/tests/lib_2/CMakeLists.txt b/tests/lib_2/CMakeLists.txt index 3a83303..6cf17b2 100644 --- a/tests/lib_2/CMakeLists.txt +++ b/tests/lib_2/CMakeLists.txt @@ -3,7 +3,9 @@ PROJECT( lib_2 C ) # TODO # dirty fix # we should make the CMAKE_D_COMPILER_ID work -IF("${CMAKE_BASE_NAME}" MATCHES "dmd") - SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) -ENDIF() +# +# This 32-bit environment check no longer needed as of dmd 2.053 on Linux +#IF("${CMAKE_BASE_NAME}" MATCHES "dmd") +# SET(CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" ) +#ENDIF() ADD_LIBRARY( lib_2 STATIC lib_2.c )