Many small Improvements. Removed old non-functional test structures. Switched to dmd for linking. Fixed bug in CMakeDInformation.cmake that we inhereted from the C version. Added C+D test case, which fails.
This commit is contained in:
parent
6af1633a9b
commit
02d13655b2
151 changed files with 100 additions and 39777 deletions
|
@ -1,12 +1,28 @@
|
|||
# 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 )
|
||||
# We must explicitly indicate we're using the D language
|
||||
# in the project declaration. Listing other languages
|
||||
# is fine.
|
||||
PROJECT (CMAKED2_TESTS C D )
|
||||
SET( GLOBAL_DMD_DEFS "-w -wi" )
|
||||
SET( GLOBAL_GCC_DEFS "-Wall -pedantic" )
|
||||
|
||||
# Don't use ADD_DEFINITIONS() with a mixed C + D project
|
||||
# since that adds the same flags to both C and D builds.
|
||||
# Also, the D linker preference is set to 40, which is
|
||||
# higher than C++ (30) and C (10). This causes CMAKE
|
||||
# to use the D linker in mixed linking cases.
|
||||
# Append our own definitions to the defaults.
|
||||
SET( CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${GLOBAL_GCC_DEFS} )
|
||||
SET( CMAKE_D_FLAGS ${CMAKE_D_FLAGS} ${GLOBAL_DMD_DEFS} )
|
||||
|
||||
enable_testing()
|
||||
|
||||
# build libs first, then apps
|
||||
ADD_SUBDIRECTORY (lib_1)
|
||||
ADD_SUBDIRECTORY (lib_2)
|
||||
ADD_SUBDIRECTORY (app_1)
|
||||
ADD_SUBDIRECTORY (app_2)
|
||||
ADD_SUBDIRECTORY (lib_1)
|
||||
ADD_SUBDIRECTORY (app_3)
|
||||
ADD_SUBDIRECTORY (app_4)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue