From 8a260c4c32e6003a198647f618c2df79e951dd9e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 17 Nov 2017 12:56:52 +0100 Subject: [PATCH] Remove CGAL setup flags @afabri This commit removes our tricks with the compilation flags. --- Installation/CMakeLists.txt | 6 -- .../cmake/modules/CGAL_SetupFlags.cmake | 86 ------------------- Installation/cmake/modules/UseCGAL.cmake | 1 - 3 files changed, 93 deletions(-) delete mode 100644 Installation/cmake/modules/CGAL_SetupFlags.cmake diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 28d82aa8ad1..01180ae9785 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -551,12 +551,6 @@ message( "== Generate version files (DONE) ==\n") # #-------------------------------------------------------------------------------------------------- -message("== Set up flags ==") - -include(CGAL_SetupFlags) - -message("== Set up flags (DONE) ==\n") - message("== Detect external libraries ==") # this is the place to tell which external libs are supporting diff --git a/Installation/cmake/modules/CGAL_SetupFlags.cmake b/Installation/cmake/modules/CGAL_SetupFlags.cmake deleted file mode 100644 index 50465fc4a72..00000000000 --- a/Installation/cmake/modules/CGAL_SetupFlags.cmake +++ /dev/null @@ -1,86 +0,0 @@ -if ( NOT CGAL_SETUP_FLAGS_INCLUDED ) - set( CGAL_SETUP_FLAGS_INCLUDED 1 ) - -# -# Set CGAL_DONT_OVERRIDE_CMAKE_FLAGS to TRUE if you need to prevent the CGAL configuration to -# override the flags used to build the libraries -# -set( CGAL_DONT_OVERRIDE_CMAKE_FLAGS_DESCRIPTION - "Set this to TRUE if you want to define or modify any of CMAKE_*_FLAGS. When this is FALSE, all the CMAKE_*_FLAGS flags are overriden with the values used when building the CGAL libs. For CGAL_*_flags (used for ADDITIONAL flags) , there is no need to set this to TRUE." - ) - -option( CGAL_DONT_OVERRIDE_CMAKE_FLAGS - ${CGAL_DONT_OVERRIDE_CMAKE_FLAGS_DESCRIPTION} - FALSE - ) - -if ( CGAL_CONFIG_LOADED AND NOT CGAL_DONT_OVERRIDE_CMAKE_FLAGS ) - - typed_cache_set ( STRING "Build type: Release, Debug, RelWithDebInfo or MinSizeRel" CMAKE_BUILD_TYPE "${CGAL_BUILD_TYPE_INIT}" ) - - string( TOUPPER "${CMAKE_BUILD_TYPE}" CGAL_BUILD_TYPE_UPPER ) - - if ( CGAL_BUILD_SHARED_LIBS ) - set( CGAL_LINKER_FLAGS_TYPE SHARED ) - else() - set( CGAL_LINKER_FLAGS_TYPE MODULE ) - endif() - - typed_cache_set ( STRING "C++ compiler flags for all build types" CMAKE_CXX_FLAGS "${CGAL_CXX_FLAGS_INIT}" ) - typed_cache_set ( STRING "C++ compiler flags for ${CGAL_BUILD_TYPE_UPPER}" CMAKE_CXX_FLAGS_${CGAL_BUILD_TYPE_UPPER} "${CGAL_CXX_FLAGS_${CGAL_BUILD_TYPE_UPPER}_INIT}" ) - typed_cache_set ( STRING "Linker flags for all build types" CMAKE_EXE_LINKER_FLAGS "${CGAL_${CGAL_LINKER_FLAGS_TYPE}_LINKER_FLAGS_INIT}" ) - typed_cache_set ( STRING "Linker flags for ${CGAL_BUILD_TYPE_UPPER}" CMAKE_EXE_LINKER_FLAGS_${CGAL_BUILD_TYPE_UPPER} "${CGAL_${CGAL_LINKER_FLAGS_TYPE}_LINKER_FLAGS_${CGAL_BUILD_TYPE_UPPER}_INIT}" ) - -endif() - -typed_cache_set( BOOL ${CGAL_DONT_OVERRIDE_CMAKE_FLAGS_DESCRIPTION} CGAL_DONT_OVERRIDE_CMAKE_FLAGS TRUE ) - -uniquely_add_flags( CMAKE_CXX_FLAGS ${CGAL_CXX_FLAGS} ) -uniquely_add_flags( CMAKE_CXX_FLAGS_RELEASE ${CGAL_CXX_FLAGS_RELEASE} ) -uniquely_add_flags( CMAKE_CXX_FLAGS_DEBUG ${CGAL_CXX_FLAGS_DEBUG} ) -uniquely_add_flags( CMAKE_MODULE_LINKER_FLAGS ${CGAL_MODULE_LINKER_FLAGS} ) -uniquely_add_flags( CMAKE_MODULE_LINKER_FLAGS_RELEASE ${CGAL_MODULE_LINKER_FLAGS_RELEASE} ) -uniquely_add_flags( CMAKE_MODULE_LINKER_FLAGS_DEBUG ${CGAL_MODULE_LINKER_FLAGS_DEBUG} ) -uniquely_add_flags( CMAKE_SHARED_LINKER_FLAGS ${CGAL_SHARED_LINKER_FLAGS} ) -uniquely_add_flags( CMAKE_SHARED_LINKER_FLAGS_RELEASE ${CGAL_SHARED_LINKER_FLAGS_RELEASE} ) -uniquely_add_flags( CMAKE_SHARED_LINKER_FLAGS_DEBUG ${CGAL_SHARED_LINKER_FLAGS_DEBUG} ) -uniquely_add_flags( CMAKE_EXE_LINKER_FLAGS ${CGAL_EXE_LINKER_FLAGS} ) -uniquely_add_flags( CMAKE_EXE_LINKER_FLAGS_RELEASE ${CGAL_EXE_LINKER_FLAGS_RELEASE} ) -uniquely_add_flags( CMAKE_EXE_LINKER_FLAGS_DEBUG ${CGAL_EXE_LINKER_FLAGS_DEBUG} ) - -# Set a default build type if none is given -if ( NOT CMAKE_BUILD_TYPE ) - if( RUNNING_CGAL_AUTO_TEST ) - typed_cache_set ( STRING "Build type: Release, Debug, RelWithDebInfo or MinSizeRel" CMAKE_BUILD_TYPE Debug ) - else () - typed_cache_set ( STRING "Build type: Release, Debug, RelWithDebInfo or MinSizeRel" CMAKE_BUILD_TYPE Release ) - endif() -endif() - -if( RUNNING_CGAL_AUTO_TEST ) - add_definitions(-DCGAL_TEST_SUITE) -endif() - -if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" - AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel" ) - message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release, Debug, RelWithDebInfo or MinSizeRel is allowed" ) -endif() - -message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" ) - -string( TOUPPER "${CMAKE_BUILD_TYPE}" CGAL_BUILD_TYPE_UPPER ) - -message( STATUS "USING CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${CGAL_BUILD_TYPE_UPPER}}'" ) - -if ( CGAL_BUILDING_LIBS ) - if ( BUILD_SHARED_LIBS ) - message( STATUS "USING LDFLAGS = '${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CGAL_BUILD_TYPE_UPPER}}'" ) - else() - message( STATUS "USING LDFLAGS = '${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_${CGAL_BUILD_TYPE_UPPER}}'" ) - endif() -else() - message( STATUS "USING EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CGAL_BUILD_TYPE_UPPER}}'" ) -endif() - -endif() - diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake index ada87290488..cd4cef66f1a 100644 --- a/Installation/cmake/modules/UseCGAL.cmake +++ b/Installation/cmake/modules/UseCGAL.cmake @@ -18,7 +18,6 @@ if(NOT USE_CGAL_FILE_INCLUDED) set(USE_CGAL_FILE_INCLUDED 1) include(${CMAKE_CURRENT_LIST_DIR}/CGAL_Common.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/CGAL_SetupFlags.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CGAL_GeneratorSpecificSettings.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CGAL_TweakFindBoost.cmake)