Mercurial > projects > qtd

changeset 109:08135aa00cc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CMake: ldc support option SINGLE_D_OBJECT now. See http://www.dsource.org/projects/ldc/ticket/309.
author SokoL_SD
date Mon, 01 Jun 2009 07:15:52 +0000
parents 9fa74f0e3fb6
children 136c9ee83ee5
files CMakeLists.txt
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Sun May 31 09:46:41 2009 +0000
+++ b/CMakeLists.txt	Mon Jun 01 07:15:52 2009 +0000
@@ -75,17 +75,16 @@
     )
 endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR "${CMAKE_INSTALL_PREFIX}" STREQUAL "")
 
-
+## TODO: disable this option for ldc < rev. 1433.
 if(D_IS_MARS)
     option(SINGLE_D_OBJECT "Build all d sources to one object file" "ON")
-elseif(D_IS_LLVM)
+elseif(D_IS_LLVM) 
     option(SINGLE_D_OBJECT "Build all d sources to one object file" "OFF")
-    if(SINGLE_D_OBJECT)
-	message(STATUS "LDC not support build multiple source files in one .obj file")
-	set(SINGLE_D_OBJECT "OFF") 
-	#set(D_FLAGS ${D_FLAGS} -singleobj)
-    endif(SINGLE_D_OBJECT)
-endif(D_IS_MARS)
+endif(D_IS_MARS)    
+
+if(SINGLE_D_OBJECT AND D_IS_LLVM)
+      set(D_FLAGS ${D_FLAGS} -singleobj)
+endif(SINGLE_D_OBJECT AND D_IS_LLVM)
 
 # Check D compiler version
 if(D_VERSION EQUAL "1")