From dd3ed5b07c918cb12ecbcf07b17aa1a919196ca8 Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Wed, 9 Mar 2016 10:11:33 +0100 Subject: [PATCH] Remove the "S" from HEADERS_ONLY --- CGAL_Core/src/CGAL_Core/CMakeLists.txt | 2 +- CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt | 13 ++----------- GraphicsView/src/CGAL_Qt5/CMakeLists.txt | 2 +- Installation/CMakeLists.txt | 14 +++++++------- Installation/src/CGAL/CMakeLists.txt | 2 +- Installation/src/CMakeLists.txt | 4 ++-- Installation/test/Installation/CMakeLists.txt | 4 ++-- 7 files changed, 16 insertions(+), 25 deletions(-) diff --git a/CGAL_Core/src/CGAL_Core/CMakeLists.txt b/CGAL_Core/src/CGAL_Core/CMakeLists.txt index 1c4a8640b61..56348a8866d 100644 --- a/CGAL_Core/src/CGAL_Core/CMakeLists.txt +++ b/CGAL_Core/src/CGAL_Core/CMakeLists.txt @@ -10,7 +10,7 @@ link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) collect_cgal_library(CGAL_Core "") -if(NOT CGAL_HEADERS_ONLY) +if(NOT CGAL_HEADER_ONLY) # CGAL_Core does not depend on CGAL in either DEBUG or RELEASE, but we # still link it. target_link_libraries( CGAL_Core CGAL ${CGAL_3RD_PARTY_LIBRARIES} ) diff --git a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt index 6578c0139f9..0f22b0b61bf 100644 --- a/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt +++ b/CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt @@ -3,19 +3,10 @@ message("Configuring libCGAL_ImageIO") find_package( OpenGL ) find_package( ZLIB ) -<<<<<<< HEAD -======= -#option(WITH_VTK "Add VTK support to libCGAL_ImageIO." OFF) - -if (CGAL_HEADERS_ONLY) +if (CGAL_HEADER_ONLY) cache_set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}) endif() -if(WITH_VTK) - find_package(VTK COMPONENTS vtkImagingCore vtkIOImage vtkFiltersImaging NO_MODULE REQUIRED) -endif(WITH_VTK) ->>>>>>> Add src/CGAL_ImageIO/ in include dirs in header mode - if(OPENGL_FOUND) message( STATUS "OpenGL include: ${OPENGL_INCLUDE_DIR}" ) message( STATUS "OpenGL libraries: ${OPENGL_LIBRARIES}" ) @@ -62,7 +53,7 @@ if(OPENGL_FOUND) add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_ImageIO_3RD_PARTY_DEFINITIONS} ) - if (NOT CGAL_HEADERS_ONLY) + if (NOT CGAL_HEADER_ONLY) add_dependencies( CGAL_ImageIO CGAL ) # CGAL_ImageIO only depends on CGAL in DEBUG, but we still link it diff --git a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt index 5ac5d38020f..ed2cb10c9f3 100644 --- a/GraphicsView/src/CGAL_Qt5/CMakeLists.txt +++ b/GraphicsView/src/CGAL_Qt5/CMakeLists.txt @@ -79,7 +79,7 @@ link_directories ( ${CGAL_LIBRARIES_DIR} ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ) collect_cgal_library( CGAL_Qt5 "${additional_files}") -if(CGAL_HEADERS_ONLY) +if(CGAL_HEADER_ONLY) set(CGAL_QT5_QTMOCCMAKE_FILES ${QTMOCCMAKE_FILES} CACHE INTERNAL "CGAL qt5 qtmoc cmake files") else() qt5_use_modules(CGAL_Qt5 OpenGL Svg) diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 44e3e16b9f0..0ecbf747884 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -32,12 +32,12 @@ endif() # -= HEADER ONLY =- # #-------------------------------------------------------------------------------------------------- -option(CGAL_HEADERS_ONLY "Enable the header only version of CGAL" OFF ) +option(CGAL_HEADER_ONLY "Enable the header only version of CGAL" OFF ) -if (CGAL_HEADERS_ONLY) - set(CGAL_HEADERS_ONLY TRUE CACHE BOOL "Enable cgal header only" FORCE) +if (CGAL_HEADER_ONLY) + set(CGAL_HEADER_ONLY TRUE CACHE BOOL "Enable cgal header only" FORCE) add_definitions(-DCGAL_HEADER_ONLY) -endif (CGAL_HEADERS_ONLY) +endif (CGAL_HEADER_ONLY) #-------------------------------------------------------------------------------------------------- # @@ -848,9 +848,9 @@ install(PROGRAMS ${scripts} DESTINATION ${CGAL_INSTALL_BIN_DIR}) install(DIRECTORY ${CGAL_MODULES_REL_DIR}/ DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) install(FILES ${CGAL_MODULES_REL_DIR}/UseCGAL.cmake DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) -if (NOT ENABLE_HEADER_ONLY) - install(EXPORT CGALExports DESTINATION ${CGAL_INSTALL_CMAKE_DIR} - NAMESPACE CGAL:: ) +if (NOT CGAL_HEADER_ONLY) + install(EXPORT CGALExports DESTINATION ${CGAL_INSTALL_CMAKE_DIR} + NAMESPACE CGAL:: ) endif() if ( GMP_IN_AUXILIARY ) diff --git a/Installation/src/CGAL/CMakeLists.txt b/Installation/src/CGAL/CMakeLists.txt index 096714656d5..26f952ce902 100644 --- a/Installation/src/CGAL/CMakeLists.txt +++ b/Installation/src/CGAL/CMakeLists.txt @@ -10,7 +10,7 @@ link_directories(${CGAL_3RD_PARTY_LIBRARIES_DIRS}) collect_cgal_library(CGAL "") -if(NOT CGAL_HEADERS_ONLY) +if(NOT CGAL_HEADER_ONLY) target_link_libraries(CGAL ${CGAL_3RD_PARTY_LIBRARIES}) endif() diff --git a/Installation/src/CMakeLists.txt b/Installation/src/CMakeLists.txt index 84104011222..c83763ece47 100644 --- a/Installation/src/CMakeLists.txt +++ b/Installation/src/CMakeLists.txt @@ -51,7 +51,7 @@ function (collect_cgal_library LIBRARY_NAME ADDITIONAL_FILES) endif() if(CGAL_AUTO_LINK_ENABLED) - if (NOT CGAL_HEADERS_ONLY) + if (NOT CGAL_HEADER_ONLY) set_target_properties( ${LIBRARY_NAME} PROPERTIES OUTPUT_NAME_DEBUG "${DEBUG_MANGLED_NAME}" OUTPUT_NAME_RELEASE "${RELEASE_MANGLED_NAME}" @@ -194,7 +194,7 @@ CGAL_add_if_target(CGAL_Core) CGAL_add_if_target(CGAL_ImageIO) CGAL_add_if_target(CGAL_Qt5) -#if (NOT CGAL_HEADERS_ONLY) # TODO Check on windows these exports +#if (NOT CGAL_HEADER_ONLY) # TODO Check on windows these exports export(TARGETS ${CGAL_ACTUAL_CONFIGURED_LIBRARIES} NAMESPACE CGAL:: FILE "${CMAKE_BINARY_DIR}/CGALExports.cmake") #endif() diff --git a/Installation/test/Installation/CMakeLists.txt b/Installation/test/Installation/CMakeLists.txt index 74bf8c51dc4..0512386bfbd 100644 --- a/Installation/test/Installation/CMakeLists.txt +++ b/Installation/test/Installation/CMakeLists.txt @@ -18,7 +18,7 @@ macro(create_link_to_program COMPONENT ) link_directories( ${${COMPONENT}_3RD_PARTY_LIBRARIES_DIRS}) # Link the executable to CGAL and third-party libraries - if ( CGAL_AUTO_LINK_ENABLED OR CGAL_HEADERS_ONLY) + if ( CGAL_AUTO_LINK_ENABLED OR CGAL_HEADER_ONLY) target_link_libraries(link_to_${COMPONENT} ${CGAL_3RD_PARTY_LIBRARIES} ${${COMPONENT}_3RD_PARTY_LIBRARIES} ) else() target_link_libraries(link_to_${COMPONENT} CGAL::${COMPONENT} ${CGAL_3RD_PARTY_LIBRARIES} ${${COMPONENT}_3RD_PARTY_LIBRARIES} ) @@ -69,7 +69,7 @@ if ( CGAL_FOUND ) find_package(Qt5 QUIET) if( Qt5_FOUND ) create_link_to_program(CGAL_Qt5) - if (CGAL_HEADERS_ONLY) + if (CGAL_HEADER_ONLY) qt5_use_modules(link_to_CGAL_Qt5) endif() endif()