mirror of https://github.com/CGAL/cgal
Merge pull request #3683 from afabri/CGAL_CMakeLists_cleanup-GF
CGAL: clean up CMakeLists.txt files in examples and tests
This commit is contained in:
commit
e3fbdb161f
|
|
@ -10,10 +10,6 @@ find_package(CGAL QUIET)
|
||||||
|
|
||||||
if ( CGAL_FOUND )
|
if ( CGAL_FOUND )
|
||||||
|
|
||||||
if (MSVC AND ( CMAKE_SIZEOF_VOID_P EQUAL 4 ) )
|
|
||||||
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# create a target per cppfile
|
# create a target per cppfile
|
||||||
file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
|
file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
|
||||||
foreach(cppfile ${cppfiles})
|
foreach(cppfile ${cppfiles})
|
||||||
|
|
|
||||||
|
|
@ -45,11 +45,6 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# include for local directory
|
|
||||||
include_directories( BEFORE include )
|
|
||||||
|
|
||||||
# include for local package
|
|
||||||
|
|
||||||
# Creating entries for all C++ files with "main" routine
|
# Creating entries for all C++ files with "main" routine
|
||||||
# ##########################################################
|
# ##########################################################
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,10 @@ find_package(CGAL QUIET COMPONENTS Core)
|
||||||
|
|
||||||
if ( CGAL_FOUND AND CGAL_Core_FOUND)
|
if ( CGAL_FOUND AND CGAL_Core_FOUND)
|
||||||
include(${CGAL_USE_FILE})
|
include(${CGAL_USE_FILE})
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
# Turn off a boost related warning that appears with VC2015
|
# Turn off a boost related warning that appears with VC2015
|
||||||
|
# boost_1_65_1\boost\graph\named_function_params.hpp(240) :
|
||||||
|
# warning C4172: returning address of local variable or temporary
|
||||||
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4172")
|
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4172")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,6 @@ if ( CGAL_FOUND )
|
||||||
|
|
||||||
find_package( TBB QUIET )
|
find_package( TBB QUIET )
|
||||||
|
|
||||||
include_directories (BEFORE ../../../AABB_tree/include)
|
|
||||||
|
|
||||||
# Use Eigen
|
# Use Eigen
|
||||||
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
|
find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater)
|
||||||
if (NOT EIGEN3_FOUND)
|
if (NOT EIGEN3_FOUND)
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ if ( CGAL_FOUND )
|
||||||
include( CGAL_VersionUtils )
|
include( CGAL_VersionUtils )
|
||||||
|
|
||||||
include_directories( BEFORE include )
|
include_directories( BEFORE include )
|
||||||
include_directories( BEFORE ../../../Arithmetic_kernel/include)
|
|
||||||
|
|
||||||
create_single_source_cgal_program( "bench_interval.cpp" )
|
create_single_source_cgal_program( "bench_interval.cpp" )
|
||||||
create_single_source_cgal_program( "constant.cpp" )
|
create_single_source_cgal_program( "constant.cpp" )
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,6 @@ find_package(CGAL QUIET)
|
||||||
|
|
||||||
if ( CGAL_FOUND )
|
if ( CGAL_FOUND )
|
||||||
|
|
||||||
include_directories (BEFORE "include")
|
|
||||||
|
|
||||||
create_single_source_cgal_program( "otr2_simplest_example.cpp" )
|
create_single_source_cgal_program( "otr2_simplest_example.cpp" )
|
||||||
create_single_source_cgal_program( "otr2_simplest_example_with_tolerance.cpp" )
|
create_single_source_cgal_program( "otr2_simplest_example_with_tolerance.cpp" )
|
||||||
create_single_source_cgal_program( "otr2_list_output_example.cpp" )
|
create_single_source_cgal_program( "otr2_list_output_example.cpp" )
|
||||||
|
|
|
||||||
|
|
@ -27,10 +27,6 @@ if ( NOT Boost_FOUND )
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# include for local directory
|
|
||||||
include_directories( BEFORE include )
|
|
||||||
|
|
||||||
# include for local package
|
|
||||||
|
|
||||||
# Creating entries for all C++ files with "main" routine
|
# Creating entries for all C++ files with "main" routine
|
||||||
# ##########################################################
|
# ##########################################################
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ if ( CGAL_FOUND )
|
||||||
if ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
|
if ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
|
||||||
# Allow Windows 32bit applications to use up to 3GB of RAM
|
# Allow Windows 32bit applications to use up to 3GB of RAM
|
||||||
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
|
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
|
||||||
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244")
|
|
||||||
endif()
|
endif()
|
||||||
# Prints new compilation options
|
# Prints new compilation options
|
||||||
message( STATUS "USING DEBUG CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" )
|
message( STATUS "USING DEBUG CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" )
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@ if ( CGAL_FOUND )
|
||||||
if ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
|
if ( CMAKE_SIZEOF_VOID_P EQUAL 4 )
|
||||||
# Allow Windows 32bit applications to use up to 3GB of RAM
|
# Allow Windows 32bit applications to use up to 3GB of RAM
|
||||||
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
|
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
|
||||||
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244")
|
|
||||||
endif()
|
endif()
|
||||||
# Prints new compilation options
|
# Prints new compilation options
|
||||||
message( STATUS "USING DEBUG CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" )
|
message( STATUS "USING DEBUG CXXFLAGS = '${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}'" )
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,6 @@ find_package(CGAL QUIET)
|
||||||
|
|
||||||
if ( CGAL_FOUND )
|
if ( CGAL_FOUND )
|
||||||
|
|
||||||
include_directories (BEFORE "../include")
|
|
||||||
|
|
||||||
# Use Eigen
|
# Use Eigen
|
||||||
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
|
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,6 @@ else()
|
||||||
include( ${EIGEN3_USE_FILE} )
|
include( ${EIGEN3_USE_FILE} )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# include for local directory
|
|
||||||
|
|
||||||
# include for local package
|
|
||||||
include_directories( BEFORE ../../include )
|
|
||||||
|
|
||||||
|
|
||||||
# Creating entries for all C++ files with "main" routine
|
# Creating entries for all C++ files with "main" routine
|
||||||
# ##########################################################
|
# ##########################################################
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,6 @@ project( Surface_mesh_parameterization_Examples )
|
||||||
cmake_minimum_required(VERSION 3.1)
|
cmake_minimum_required(VERSION 3.1)
|
||||||
|
|
||||||
|
|
||||||
# Include this package's headers first
|
|
||||||
include_directories (BEFORE . include)
|
|
||||||
|
|
||||||
# Find CGAL
|
# Find CGAL
|
||||||
find_package(CGAL QUIET)
|
find_package(CGAL QUIET)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,9 +6,6 @@ project( Surface_mesh_parameterization_Tests )
|
||||||
cmake_minimum_required(VERSION 3.1)
|
cmake_minimum_required(VERSION 3.1)
|
||||||
|
|
||||||
|
|
||||||
# Include this package's headers first
|
|
||||||
include_directories (BEFORE . include)
|
|
||||||
|
|
||||||
# Find CGAL
|
# Find CGAL
|
||||||
find_package(CGAL QUIET)
|
find_package(CGAL QUIET)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue