Changeset 791:3e0b643090f1

Timestamp:

11/27/08 11:41:49 (1 month ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Apply Elrood's CMake patch from #132.

Files:

• runtime/CMakeLists.txt (modified) (5 diffs)

runtime/CMakeLists.txt

@@ -2 +2 @@
-
-cmake_minimum_required(VERSION 2.6)
-
-# not working, gcc has to be on the path before invoking make
-#set(ENV{PATH} ENV{PATH} CMAKE_C_COMPILER:FILEPATH)
-
-find_program(GCC_EXE gcc DOC "path to gcc binary")
@@ -16 +13 @@
-set(D_FLAGS -g -w -d CACHE STRING "runtime build flags, separated by ;")
-
-get_directory_property(PROJECT_PARENT_DIR DIRECTORY ${PROJECT_SOURCE_DIR} PARENT_DIRECTORY)
-if(D_VERSION EQUAL 1)
-    set(RUNTIME tango)
-    set(LDC_EXE ldc)
-elseif(D_VERSION EQUAL 2)
-    set(RUNTIME druntime)
-    set(LDC_EXE ldc2)
-else(D_VERSION EQUAL 1)
-    message(FATAL_ERROR "set d version to 1 or 2")
-endif(D_VERSION EQUAL 1)
+get_directory_property(PROJECT_PARENT_DIR DIRECTORY ${PROJECT_SOURCE_DIR} PARENT_DIRECTORY)
+set(RUNTIME_DIR ${PROJECT_PARENT_DIR}/${RUNTIME} CACHE PATH "runtime source dir" FORCE)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-# should only be necessary if run independently from ldc cmake project
@@ -44 +73 @@
-    endif(NOT LDC_LOC)
-endif(NOT LDC_LOC)
-#
-
-configure_file(${PROJECT_PARENT_DIR}/${LDC_EXE}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf)
@@ -58 +86 @@
-        WORKING_DIRECTORY ${RUNTIME_DIR}
-    )
-
+
+
+
+
+
-endif(NOT PATCH_EXE)
-#
-
-# build tango for D1, druntime for D2
-if(D_VERSION EQUAL 1)
-    # library names
-    set(RUNTIME_CC tango-cc-tango)
-    set(RUNTIME_GC tango-gc-basic)
-    set(RUNTIME_DC ldc-runtime)
-    set(RUNTIME_AIO tango-ldc)
-    # set paths to source files, or fill lists directly
-    set(RUNTIME_DC_DIR ${PROJECT_SOURCE_DIR}/internal)
-    set(RUNTIME_GC_DIR ${RUNTIME_DIR}/lib/gc/basic)
-    file(GLOB CORE_D ${RUNTIME_DIR}/lib/common/tango/core/*.d)
-    file(GLOB CORE_C ${RUNTIME_DIR}/lib/common/tango/stdc/*.c)
-    # copy imports to runtime dir
-    add_custom_command(
-        TARGET ldc-runtime
-        POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/import/ldc ${RUNTIME_DIR}/ldc
-        COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/internal/ldc/bitmanip.d ${RUNTIME_DIR}/ldc
-        COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/internal/ldc/vararg.d ${RUNTIME_DIR}/ldc
-    )
-elseif(D_VERSION EQUAL 2)
-    set(RUNTIME_CC druntime-core)
-    set(RUNTIME_GC druntime-gc-basic)
-    set(RUNTIME_DC druntime-rt-ldc)
-    set(RUNTIME_AIO druntime-ldc)
-    set(RUNTIME_DC_DIR ${RUNTIME_DIR}/src/compiler/ldc)
-    set(RUNTIME_GC_DIR ${RUNTIME_DIR}/src/gc/basic)
-    file(GLOB CORE_D ${RUNTIME_DIR}/src/common/core/*.d)
-    file(GLOB CORE_C ${RUNTIME_DIR}/src/common/core/stdc/*.c)
-endif(D_VERSION EQUAL 1)
-
-file(GLOB GC_D ${RUNTIME_GC_DIR}/*.d)
@@ -113 +113 @@
-endmacro(dc)
-
+# dc_dir include for core and gc only necessary with druntime
-foreach(f ${CORE_D})
-.
+${RUNTIME_DC_DIR}
-endforeach(f)
-
-foreach(f ${GC_D})
-${RUNTIME_GC_DIR}
+"${RUNTIME_GC_DIR} ${RUNTIME_DC_DIR}"
-endforeach(f)
-