From 3c95b4a06a99208f5abe1fb7b9026df251b98ce9 Mon Sep 17 00:00:00 2001 From: Andrea Michelotti <andrea.michelotti@lnf.infn.it> Date: Fri, 19 Dec 2014 15:46:11 +0100 Subject: [PATCH] testing.. --- CMakeLists.txt | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92d00bd94..4c59d63fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,30 +1,19 @@ -cmake_minimum_required (VERSION 2.6) +cmake_minimum_required(VERSION 2.6) +include($ENV{CHAOS_BUNDLE}/tools/project_template/CMakeChaos.txt) project (chaos) SET( ${PROJECT_NAME}_MAJOR_VERSION 0 ) SET( ${PROJECT_NAME}_MINOR_VERSION 1 ) SET( ${PROJECT_NAME}_PATCH_LEVEL 0 ) -IF( NOT BUILD_FORCE_STATIC) - add_definitions(-DBOOST_ALL_DYN_LINK) -ENDIF() add_definitions(-DDEBUG) -OPTION( BUILD_FORCE_32 "Force 32 bit compilation" OFF ) EXECUTE_PROCESS(COMMAND chaos/common/version.sh) -INCLUDE_DIRECTORIES(. ${CMAKE_INSTALL_PREFIX}/include /usr/local/include) -LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib /usr/local/lib) ADD_DEFINITIONS(-O3 ) -IF( BUILD_FORCE_32 ) - MESSAGE( STATUS "Forcing 32 bit compilation" ) - set (CMAKE_C_FLAGS "-m32 ") - set (CMAKE_CXX_FLAGS "-m32") - set (CMAKE_LINK_FLAGS "-m32") -ENDIF() IF(NOT BUILD_PREFIX) set (BUILD_PREFIX usr/local) -- GitLab