From f8a15aecfef6290db831246d78db21364ed901a1 Mon Sep 17 00:00:00 2001 From: Steve King Date: Wed, 11 Aug 2010 21:17:46 -0700 Subject: [PATCH] Some dos2unix fixes. Fixed path error in run_tests_linux.sh. Set CMAKE_MODULE_PATH to look locally first in tests/CmakeLists.txt. --- cmaked/CMakeDCompiler.cmake.in | 88 +++---- cmaked/CMakeDInformation.cmake | 408 ++++++++++++++++----------------- tests/CMakeLists.txt | 3 + tests/run_tests_linux.sh | 4 +- 4 files changed, 253 insertions(+), 250 deletions(-) diff --git a/cmaked/CMakeDCompiler.cmake.in b/cmaked/CMakeDCompiler.cmake.in index 487b022..8e2eebf 100644 --- a/cmaked/CMakeDCompiler.cmake.in +++ b/cmaked/CMakeDCompiler.cmake.in @@ -1,44 +1,44 @@ -SET(CMAKE_D_COMPILER "@CMAKE_D_COMPILER@") -SET(CMAKE_D_COMPILER_ARG1 "@CMAKE_D_COMPILER_ARG1@") -SET(CMAKE_D_COMPILER_ID "@CMAKE_D_COMPILER_ID@") -SET(CMAKE_D_PLATFORM_ID "@CMAKE_D_PLATFORM_ID@") -@SET_MSVC_D_ARCHITECTURE_ID@ -SET(CMAKE_AR "@CMAKE_AR@") -SET(CMAKE_RANLIB "@CMAKE_RANLIB@") -SET(CMAKE_LINKER "@CMAKE_LINKER@") -SET(CMAKE_COMPILER_IS_GDC @CMAKE_COMPILER_IS_GDC@) -SET(CMAKE_COMPILER_IS_DMD @CMAKE_COMPILER_IS_DMD@) -SET(CMAKE_D_COMPILER_LOADED 1) -SET(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@) -SET(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@) -IF(CMAKE_COMPILER_IS_CYGWIN) - SET(CYGWIN 1) - SET(UNIX 1) -ENDIF(CMAKE_COMPILER_IS_CYGWIN) - -SET(CMAKE_D_COMPILER_ENV_VAR "DC") - -IF(CMAKE_COMPILER_IS_MINGW) - SET(MINGW 1) -ENDIF(CMAKE_COMPILER_IS_MINGW) -SET(CMAKE_COMPILER_IS_GDC_RUN 1) -SET(CMAKE_D_SOURCE_FILE_EXTENSIONS d) -SET(CMAKE_D_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -SET(CMAKE_D_LINKER_PREFERENCE None) -# Save compiler ABI information. -SET(CMAKE_D_SIZEOF_DATA_PTR "@CMAKE_D_SIZEOF_DATA_PTR@") -SET(CMAKE_D_COMPILER_ABI "@CMAKE_D_COMPILER_ABI@") - -IF(CMAKE_D_SIZEOF_DATA_PTR) - SET(CMAKE_SIZEOF_VOID_P "${CMAKE_D_SIZEOF_DATA_PTR}") -ENDIF(CMAKE_D_SIZEOF_DATA_PTR) - -IF(CMAKE_D_COMPILER_ABI) - SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_D_COMPILER_ABI}") -ENDIF(CMAKE_D_COMPILER_ABI) - -SET(CMAKE_D_HAS_ISYSROOT "@CMAKE_D_HAS_ISYSROOT@") -@CMAKE_D_OSX_DEPLOYMENT_TARGET_FLAG_CODE@ - -SET(CMAKE_D_IMPLICIT_LINK_LIBRARIES "@CMAKE_D_IMPLICIT_LINK_LIBRARIES@") -SET(CMAKE_D_IMPLICIT_LINK_DIRECTORIES "@CMAKE_D_IMPLICIT_LINK_DIRECTORIES@") +SET(CMAKE_D_COMPILER "@CMAKE_D_COMPILER@") +SET(CMAKE_D_COMPILER_ARG1 "@CMAKE_D_COMPILER_ARG1@") +SET(CMAKE_D_COMPILER_ID "@CMAKE_D_COMPILER_ID@") +SET(CMAKE_D_PLATFORM_ID "@CMAKE_D_PLATFORM_ID@") +@SET_MSVC_D_ARCHITECTURE_ID@ +SET(CMAKE_AR "@CMAKE_AR@") +SET(CMAKE_RANLIB "@CMAKE_RANLIB@") +SET(CMAKE_LINKER "@CMAKE_LINKER@") +SET(CMAKE_COMPILER_IS_GDC @CMAKE_COMPILER_IS_GDC@) +SET(CMAKE_COMPILER_IS_DMD @CMAKE_COMPILER_IS_DMD@) +SET(CMAKE_D_COMPILER_LOADED 1) +SET(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@) +SET(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@) +IF(CMAKE_COMPILER_IS_CYGWIN) + SET(CYGWIN 1) + SET(UNIX 1) +ENDIF(CMAKE_COMPILER_IS_CYGWIN) + +SET(CMAKE_D_COMPILER_ENV_VAR "DC") + +IF(CMAKE_COMPILER_IS_MINGW) + SET(MINGW 1) +ENDIF(CMAKE_COMPILER_IS_MINGW) +SET(CMAKE_COMPILER_IS_GDC_RUN 1) +SET(CMAKE_D_SOURCE_FILE_EXTENSIONS d) +SET(CMAKE_D_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) +SET(CMAKE_D_LINKER_PREFERENCE None) +# Save compiler ABI information. +SET(CMAKE_D_SIZEOF_DATA_PTR "@CMAKE_D_SIZEOF_DATA_PTR@") +SET(CMAKE_D_COMPILER_ABI "@CMAKE_D_COMPILER_ABI@") + +IF(CMAKE_D_SIZEOF_DATA_PTR) + SET(CMAKE_SIZEOF_VOID_P "${CMAKE_D_SIZEOF_DATA_PTR}") +ENDIF(CMAKE_D_SIZEOF_DATA_PTR) + +IF(CMAKE_D_COMPILER_ABI) + SET(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_D_COMPILER_ABI}") +ENDIF(CMAKE_D_COMPILER_ABI) + +SET(CMAKE_D_HAS_ISYSROOT "@CMAKE_D_HAS_ISYSROOT@") +@CMAKE_D_OSX_DEPLOYMENT_TARGET_FLAG_CODE@ + +SET(CMAKE_D_IMPLICIT_LINK_LIBRARIES "@CMAKE_D_IMPLICIT_LINK_LIBRARIES@") +SET(CMAKE_D_IMPLICIT_LINK_DIRECTORIES "@CMAKE_D_IMPLICIT_LINK_DIRECTORIES@") diff --git a/cmaked/CMakeDInformation.cmake b/cmaked/CMakeDInformation.cmake index 681486d..20fc63a 100644 --- a/cmaked/CMakeDInformation.cmake +++ b/cmaked/CMakeDInformation.cmake @@ -1,204 +1,204 @@ -# -# CMakeD - CMake module for D Language -# -# Copyright (c) 2007, Selman Ulug -# Tim Burrell -# -# All rights reserved. -# -# See Copyright.txt for details. -# -# Modified from CMake 2.6.5 CMakeCInformation.cmake -# See http://www.cmake.org/HTML/Copyright.html for details -# - -# This file sets the basic flags for the D language in CMake. -# It also loads the available platform file for the system-compiler -# if it exists. -# It also loads a system - compiler - processor (or target hardware) -# specific file, which is mainly useful for crosscompiling and embedded systems. - -# some compilers use different extensions (e.g. sdcc uses .rel) -# so set the extension here first so it can be overridden by the compiler specific file -IF(UNIX) - SET(CMAKE_D_OUTPUT_EXTENSION .o) -ELSE(UNIX) - SET(CMAKE_D_OUTPUT_EXTENSION .obj) -ENDIF(UNIX) - -# Load compiler-specific information. -IF(CMAKE_D_COMPILER_ID) - INCLUDE(Compiler/${CMAKE_D_COMPILER_ID}-D OPTIONAL) -ENDIF(CMAKE_D_COMPILER_ID) - -SET(CMAKE_BASE_NAME) -GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_D_COMPILER} NAME_WE) -# This will need updating for the LLVM based ldc -IF(CMAKE_COMPILER_IS_GDC) - SET(CMAKE_D_OUTPUT_NAME_SWITCH "-o") - SET(CMAKE_BASE_NAME gdc) -ELSE(CMAKE_COMPILER_IS_GDC) - SET(CMAKE_D_OUTPUT_NAME_SWITCH "-of") - SET(CMAKE_BASE_NAME dmd) -ENDIF(CMAKE_COMPILER_IS_GDC) - - -# load a hardware specific file, mostly useful for embedded compilers -IF(CMAKE_SYSTEM_PROCESSOR) - IF(CMAKE_D_COMPILER_ID) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_D_COMPILER_ID}-D-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) - ENDIF(CMAKE_D_COMPILER_ID) - IF (NOT _INCLUDED_FILE) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL) - ENDIF (NOT _INCLUDED_FILE) -ENDIF(CMAKE_SYSTEM_PROCESSOR) - - -# load the system- and compiler specific files -IF(CMAKE_D_COMPILER_ID) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_D_COMPILER_ID}-D - OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) -ENDIF(CMAKE_D_COMPILER_ID) -IF (NOT _INCLUDED_FILE) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} - OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) -ENDIF (NOT _INCLUDED_FILE) -# We specify the compiler information in the system file for some -# platforms, but this language may not have been enabled when the file -# was first included. Include it again to get the language info. -# Remove this when all compiler info is removed from system files. -IF (NOT _INCLUDED_FILE) - INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL) -ENDIF (NOT _INCLUDED_FILE) - - -# This should be included before the _INIT variables are -# used to initialize the cache. Since the rule variables -# have if blocks on them, users can still define them here. -# But, it should still be after the platform file so changes can -# be made to those values. - -IF(CMAKE_USER_MAKE_RULES_OVERRIDE) - INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) -ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) - -IF(CMAKE_USER_MAKE_RULES_OVERRIDE_D) - INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_D}) -ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_D) - -# for most systems a module is the same as a shared library -# so unless the variable CMAKE_MODULE_EXISTS is set just -# copy the values from the LIBRARY variables -IF(NOT CMAKE_MODULE_EXISTS) - SET(CMAKE_SHARED_MODULE_D_FLAGS ${CMAKE_SHARED_LIBRARY_D_FLAGS}) - SET(CMAKE_SHARED_MODULE_CREATE_D_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS}) -ENDIF(NOT CMAKE_MODULE_EXISTS) - -SET(CMAKE_D_FLAGS_INIT "$ENV{DFLAGS} ${CMAKE_D_FLAGS_INIT}") -# avoid just having a space as the initial value for the cache -IF(CMAKE_D_FLAGS_INIT STREQUAL " ") - SET(CMAKE_D_FLAGS_INIT) -ENDIF(CMAKE_D_FLAGS_INIT STREQUAL " ") -SET (CMAKE_D_FLAGS "${CMAKE_D_FLAGS_INIT}" CACHE STRING - "Flags used by the D compiler during all build types.") - -IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) -# default build type is none - IF(NOT CMAKE_NO_BUILD_TYPE) - SET (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING - "Choose the type of build, options are: None(CMAKE_D_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") - ENDIF(NOT CMAKE_NO_BUILD_TYPE) - SET (CMAKE_D_FLAGS_DEBUG "${CMAKE_D_FLAGS_DEBUG_INIT}" CACHE STRING - "Flags used by the compiler during debug builds.") - SET (CMAKE_D_FLAGS_MINSIZEREL "${CMAKE_D_FLAGS_MINSIZEREL_INIT}" CACHE STRING - "Flags used by the compiler during release minsize builds.") - SET (CMAKE_D_FLAGS_RELEASE "${CMAKE_D_FLAGS_RELEASE_INIT}" CACHE STRING - "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).") - SET (CMAKE_D_FLAGS_RELWITHDEBINFO "${CMAKE_D_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING - "Flags used by the compiler during Release with Debug Info builds.") -ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) - -IF(CMAKE_D_STANDARD_LIBRARIES_INIT) - SET(CMAKE_D_STANDARD_LIBRARIES "${CMAKE_D_STANDARD_LIBRARIES_INIT}" - CACHE STRING "Libraries linked by default with all D applications.") - MARK_AS_ADVANCED(CMAKE_D_STANDARD_LIBRARIES) -ENDIF(CMAKE_D_STANDARD_LIBRARIES_INIT) - -INCLUDE(CMakeCommonLanguageInclude) - -# now define the following rule variables - -# CMAKE_D_CREATE_SHARED_LIBRARY -# CMAKE_D_CREATE_SHARED_MODULE -# CMAKE_D_CREATE_STATIC_LIBRARY -# CMAKE_D_COMPILE_OBJECT -# CMAKE_D_LINK_EXECUTABLE - -# variables supplied by the generator at use time -# -# the target without the suffix -# -# -# -# -# - -# D compiler information -# -# -# -# - -# Static library tools -# -# - - -# create a D shared library -IF(NOT CMAKE_D_CREATE_SHARED_LIBRARY) - SET(CMAKE_D_CREATE_SHARED_LIBRARY - " ${CMAKE_D_OUTPUT_NAME_SWITCH} ${DSTDLIB_FLAGS} ${CMAKE_D_STDLIBS}") -ENDIF(NOT CMAKE_D_CREATE_SHARED_LIBRARY) - -# create a D shared module just copy the shared library rule -IF(NOT CMAKE_D_CREATE_SHARED_MODULE) - SET(CMAKE_D_CREATE_SHARED_MODULE ${CMAKE_D_CREATE_SHARED_LIBRARY}) -ENDIF(NOT CMAKE_D_CREATE_SHARED_MODULE) - -# Create a static archive incrementally for large object file counts. -# If CMAKE_D_CREATE_STATIC_LIBRARY is set it will override these. -SET(CMAKE_D_ARCHIVE_CREATE " cr ") -SET(CMAKE_D_ARCHIVE_APPEND " r ") -SET(CMAKE_D_ARCHIVE_FINISH " ") - -# compile a D file into an object file -IF(NOT CMAKE_D_COMPILE_OBJECT) - SET(CMAKE_D_COMPILE_OBJECT - " ${CMAKE_D_OUTPUT_NAME_SWITCH} -c ") -ENDIF(NOT CMAKE_D_COMPILE_OBJECT) - -IF(NOT CMAKE_D_LINK_EXECUTABLE) - SET(CMAKE_D_LINK_EXECUTABLE - "gcc -o ${CMAKE_D_STDLIBS}") -ENDIF(NOT CMAKE_D_LINK_EXECUTABLE) - -IF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG) - SET(CMAKE_EXECUTABLE_RUNTIME_D_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG}) -ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG) - -IF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP) - SET(CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG_SEP}) -ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP) - -IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG) - SET(CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_D_FLAG}) -ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG) - -MARK_AS_ADVANCED( -CMAKE_D_FLAGS -CMAKE_D_FLAGS_DEBUG -CMAKE_D_FLAGS_MINSIZEREL -CMAKE_D_FLAGS_RELEASE -CMAKE_D_FLAGS_RELWITHDEBINFO -) -SET(CMAKE_D_INFORMATION_LOADED 1) +# +# CMakeD - CMake module for D Language +# +# Copyright (c) 2007, Selman Ulug +# Tim Burrell +# +# All rights reserved. +# +# See Copyright.txt for details. +# +# Modified from CMake 2.6.5 CMakeCInformation.cmake +# See http://www.cmake.org/HTML/Copyright.html for details +# + +# This file sets the basic flags for the D language in CMake. +# It also loads the available platform file for the system-compiler +# if it exists. +# It also loads a system - compiler - processor (or target hardware) +# specific file, which is mainly useful for crosscompiling and embedded systems. + +# some compilers use different extensions (e.g. sdcc uses .rel) +# so set the extension here first so it can be overridden by the compiler specific file +IF(UNIX) + SET(CMAKE_D_OUTPUT_EXTENSION .o) +ELSE(UNIX) + SET(CMAKE_D_OUTPUT_EXTENSION .obj) +ENDIF(UNIX) + +# Load compiler-specific information. +IF(CMAKE_D_COMPILER_ID) + INCLUDE(Compiler/${CMAKE_D_COMPILER_ID}-D OPTIONAL) +ENDIF(CMAKE_D_COMPILER_ID) + +SET(CMAKE_BASE_NAME) +GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_D_COMPILER} NAME_WE) +# This will need updating for the LLVM based ldc +IF(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_D_OUTPUT_NAME_SWITCH "-o") + SET(CMAKE_BASE_NAME gdc) +ELSE(CMAKE_COMPILER_IS_GDC) + SET(CMAKE_D_OUTPUT_NAME_SWITCH "-of") + SET(CMAKE_BASE_NAME dmd) +ENDIF(CMAKE_COMPILER_IS_GDC) + + +# load a hardware specific file, mostly useful for embedded compilers +IF(CMAKE_SYSTEM_PROCESSOR) + IF(CMAKE_D_COMPILER_ID) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_D_COMPILER_ID}-D-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) + ENDIF(CMAKE_D_COMPILER_ID) + IF (NOT _INCLUDED_FILE) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}-${CMAKE_SYSTEM_PROCESSOR} OPTIONAL) + ENDIF (NOT _INCLUDED_FILE) +ENDIF(CMAKE_SYSTEM_PROCESSOR) + + +# load the system- and compiler specific files +IF(CMAKE_D_COMPILER_ID) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_D_COMPILER_ID}-D + OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) +ENDIF(CMAKE_D_COMPILER_ID) +IF (NOT _INCLUDED_FILE) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} + OPTIONAL RESULT_VARIABLE _INCLUDED_FILE) +ENDIF (NOT _INCLUDED_FILE) +# We specify the compiler information in the system file for some +# platforms, but this language may not have been enabled when the file +# was first included. Include it again to get the language info. +# Remove this when all compiler info is removed from system files. +IF (NOT _INCLUDED_FILE) + INCLUDE(Platform/${CMAKE_SYSTEM_NAME} OPTIONAL) +ENDIF (NOT _INCLUDED_FILE) + + +# This should be included before the _INIT variables are +# used to initialize the cache. Since the rule variables +# have if blocks on them, users can still define them here. +# But, it should still be after the platform file so changes can +# be made to those values. + +IF(CMAKE_USER_MAKE_RULES_OVERRIDE) + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) +ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) + +IF(CMAKE_USER_MAKE_RULES_OVERRIDE_D) + INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_D}) +ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_D) + +# for most systems a module is the same as a shared library +# so unless the variable CMAKE_MODULE_EXISTS is set just +# copy the values from the LIBRARY variables +IF(NOT CMAKE_MODULE_EXISTS) + SET(CMAKE_SHARED_MODULE_D_FLAGS ${CMAKE_SHARED_LIBRARY_D_FLAGS}) + SET(CMAKE_SHARED_MODULE_CREATE_D_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS}) +ENDIF(NOT CMAKE_MODULE_EXISTS) + +SET(CMAKE_D_FLAGS_INIT "$ENV{DFLAGS} ${CMAKE_D_FLAGS_INIT}") +# avoid just having a space as the initial value for the cache +IF(CMAKE_D_FLAGS_INIT STREQUAL " ") + SET(CMAKE_D_FLAGS_INIT) +ENDIF(CMAKE_D_FLAGS_INIT STREQUAL " ") +SET (CMAKE_D_FLAGS "${CMAKE_D_FLAGS_INIT}" CACHE STRING + "Flags used by the D compiler during all build types.") + +IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) +# default build type is none + IF(NOT CMAKE_NO_BUILD_TYPE) + SET (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING + "Choose the type of build, options are: None(CMAKE_D_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.") + ENDIF(NOT CMAKE_NO_BUILD_TYPE) + SET (CMAKE_D_FLAGS_DEBUG "${CMAKE_D_FLAGS_DEBUG_INIT}" CACHE STRING + "Flags used by the compiler during debug builds.") + SET (CMAKE_D_FLAGS_MINSIZEREL "${CMAKE_D_FLAGS_MINSIZEREL_INIT}" CACHE STRING + "Flags used by the compiler during release minsize builds.") + SET (CMAKE_D_FLAGS_RELEASE "${CMAKE_D_FLAGS_RELEASE_INIT}" CACHE STRING + "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).") + SET (CMAKE_D_FLAGS_RELWITHDEBINFO "${CMAKE_D_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING + "Flags used by the compiler during Release with Debug Info builds.") +ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) + +IF(CMAKE_D_STANDARD_LIBRARIES_INIT) + SET(CMAKE_D_STANDARD_LIBRARIES "${CMAKE_D_STANDARD_LIBRARIES_INIT}" + CACHE STRING "Libraries linked by default with all D applications.") + MARK_AS_ADVANCED(CMAKE_D_STANDARD_LIBRARIES) +ENDIF(CMAKE_D_STANDARD_LIBRARIES_INIT) + +INCLUDE(CMakeCommonLanguageInclude) + +# now define the following rule variables + +# CMAKE_D_CREATE_SHARED_LIBRARY +# CMAKE_D_CREATE_SHARED_MODULE +# CMAKE_D_CREATE_STATIC_LIBRARY +# CMAKE_D_COMPILE_OBJECT +# CMAKE_D_LINK_EXECUTABLE + +# variables supplied by the generator at use time +# +# the target without the suffix +# +# +# +# +# + +# D compiler information +# +# +# +# + +# Static library tools +# +# + + +# create a D shared library +IF(NOT CMAKE_D_CREATE_SHARED_LIBRARY) + SET(CMAKE_D_CREATE_SHARED_LIBRARY + " ${CMAKE_D_OUTPUT_NAME_SWITCH} ${DSTDLIB_FLAGS} ${CMAKE_D_STDLIBS}") +ENDIF(NOT CMAKE_D_CREATE_SHARED_LIBRARY) + +# create a D shared module just copy the shared library rule +IF(NOT CMAKE_D_CREATE_SHARED_MODULE) + SET(CMAKE_D_CREATE_SHARED_MODULE ${CMAKE_D_CREATE_SHARED_LIBRARY}) +ENDIF(NOT CMAKE_D_CREATE_SHARED_MODULE) + +# Create a static archive incrementally for large object file counts. +# If CMAKE_D_CREATE_STATIC_LIBRARY is set it will override these. +SET(CMAKE_D_ARCHIVE_CREATE " cr ") +SET(CMAKE_D_ARCHIVE_APPEND " r ") +SET(CMAKE_D_ARCHIVE_FINISH " ") + +# compile a D file into an object file +IF(NOT CMAKE_D_COMPILE_OBJECT) + SET(CMAKE_D_COMPILE_OBJECT + " ${CMAKE_D_OUTPUT_NAME_SWITCH} -c ") +ENDIF(NOT CMAKE_D_COMPILE_OBJECT) + +IF(NOT CMAKE_D_LINK_EXECUTABLE) + SET(CMAKE_D_LINK_EXECUTABLE + "gcc -o ${CMAKE_D_STDLIBS}") +ENDIF(NOT CMAKE_D_LINK_EXECUTABLE) + +IF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG) + SET(CMAKE_EXECUTABLE_RUNTIME_D_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG}) +ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG) + +IF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP) + SET(CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG_SEP}) +ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP) + +IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG) + SET(CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_D_FLAG}) +ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG) + +MARK_AS_ADVANCED( +CMAKE_D_FLAGS +CMAKE_D_FLAGS_DEBUG +CMAKE_D_FLAGS_MINSIZEREL +CMAKE_D_FLAGS_RELEASE +CMAKE_D_FLAGS_RELWITHDEBINFO +) +SET(CMAKE_D_INFORMATION_LOADED 1) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cd6a0ec..7cde510 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,8 @@ # Tell cmake our project only concerns the D language. cmake_minimum_required(VERSION 2.8) +# Look for cmake modules locally first +set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../cmaked) + PROJECT (CMAKED2_TESTS D) ADD_DEFINITIONS( -w -wi ) enable_testing() diff --git a/tests/run_tests_linux.sh b/tests/run_tests_linux.sh index 435cd0f..fb1f27d 100755 --- a/tests/run_tests_linux.sh +++ b/tests/run_tests_linux.sh @@ -8,7 +8,7 @@ cd cmaked_test_build mkdir -p release cd release # Do a release build -cmake ../../tests +cmake ../../cmaked2/tests make make test cd .. @@ -16,7 +16,7 @@ cd .. # Do a debug build mkdir -p debug cd debug -cmake -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../tests +cmake -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../cmaked2/tests make make test cd ../..