From 52069200639e7a4f88952e7c33ad6500807b2348 Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Thu, 11 Mar 2010 16:00:38 +0000 Subject: [PATCH] * All tools: - Change: Adaptation to cmake 2.8. No more "add_subdirectory()" when the sub directory doesn't hold a CMakeList.txt. For "add_definition()", set policy 00005 to NEW. - Change: Integrate IO extenal libraries. - Change: Small compatibilities between "size_t" and "unsigned int" under 64 bits. - Change: Temporarily disable Equinox/Solstice in unicorn. --- crlcore/CMakeLists.txt | 1 + crlcore/src/CMakeLists.txt | 1 - crlcore/src/ccore/CMakeLists.txt | 5 +---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt index 2e9c7d34..7e425039 100644 --- a/crlcore/CMakeLists.txt +++ b/crlcore/CMakeLists.txt @@ -4,6 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) IF(COMMAND CMAKE_POLICY) CMAKE_POLICY(SET CMP0003 NEW) + CMAKE_POLICY(SET CMP0005 NEW) ENDIF(COMMAND CMAKE_POLICY) SET(CMAKE_MODULE_PATH "${CRLCORE_SOURCE_DIR}/cmake_modules/" "$ENV{HURRICANE_TOP}/share/cmake_modules/" "$ENV{IO_TOP}/share/cmake_modules/" ) diff --git a/crlcore/src/CMakeLists.txt b/crlcore/src/CMakeLists.txt index af026ef9..480b55a0 100644 --- a/crlcore/src/CMakeLists.txt +++ b/crlcore/src/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(fonts) add_subdirectory(ccore) add_subdirectory(cyclop) add_subdirectory(x2y) diff --git a/crlcore/src/ccore/CMakeLists.txt b/crlcore/src/ccore/CMakeLists.txt index 88b19f1b..7d6d9210 100644 --- a/crlcore/src/ccore/CMakeLists.txt +++ b/crlcore/src/ccore/CMakeLists.txt @@ -17,7 +17,7 @@ ${CRLCORE_SOURCE_DIR}/src/ccore/toolbox ) - add_definitions ( -DCORIOLIS_TOP=\\"${PROJECT_BINARY_DIR}\\" ) + add_definitions ( -DCORIOLIS_TOP="${PROJECT_BINARY_DIR}" ) set ( includes crlcore/Utilities.h crlcore/Memory.h @@ -124,7 +124,6 @@ set ( VstParserGrammar ${VstParserSourceDir}/VstParserGrammar.yy ) set ( VstParserScannerCpp ${VstParserBinaryDir}/VstParserScanner.cpp ) set ( VstParserGrammarCpp ${VstParserBinaryDir}/VstParserGrammar.cpp ) - add_subdirectory ( alliance ) add_custom_target ( VstParser echo "Creating VST parser" ) add_custom_command ( SOURCE ${VstParserScanner} COMMAND ${FLEX_EXECUTABLE} @@ -153,7 +152,6 @@ set ( IocParserGrammar ${IocParserSourceDir}/IocParserGrammar.yy ) set ( IocParserScannerCpp ${IocParserBinaryDir}/IocParserScanner.cpp ) set ( IocParserGrammarCpp ${IocParserBinaryDir}/IocParserGrammar.cpp ) - add_subdirectory ( ioc ) add_custom_target ( IocParser echo "Creating IOC parser" ) add_custom_command ( SOURCE ${IocParserScanner} COMMAND ${FLEX_EXECUTABLE} @@ -182,7 +180,6 @@ # # set ( LibertyParserGrammar ${LibertyParserSourceDir}/LibertyParserGrammar.yy ) # # set ( LibertyParserScannerCpp ${LibertyParserBinaryDir}/LibertyParserScanner.cpp ) # # set ( LibertyParserGrammarCpp ${LibertyParserBinaryDir}/LibertyParserGrammar.cpp ) -# # add_subdirectory ( liberty ) # # add_custom_target ( LibertyParser echo "Creating LIBERTY parser" ) # # add_custom_command ( SOURCE ${LibertyParserScanner} # COMMAND ${FLEX_EXECUTABLE}