songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the "S" from HEADERS_ONLY

This commit is contained in:
Clement Jamin 2016-03-09 10:11:33 +01:00 committed by Guillaume Damiand
parent 35a11c0e13
commit dd3ed5b07c
7 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CGAL_Core/src/CGAL_Core/CMakeLists.txt
View File

@ -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} )

13
CGAL_ImageIO/src/CGAL_ImageIO/CMakeLists.txt
View File

@ -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

2
GraphicsView/src/CGAL_Qt5/CMakeLists.txt
View File

@ -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)

14
Installation/CMakeLists.txt
View File

@ -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 )

2
Installation/src/CGAL/CMakeLists.txt
View File

@ -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()

4
Installation/src/CMakeLists.txt
View File

@ -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()

4
Installation/test/Installation/CMakeLists.txt
View File

@ -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()