diff --git a/CGALimageIO/examples/CGALimageIO/CMakeLists.txt b/CGALimageIO/examples/CGALimageIO/CMakeLists.txt deleted file mode 100644 index b17e6433e86..00000000000 --- a/CGALimageIO/examples/CGALimageIO/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Created by the script cgal_create_cmake_script -# This is the CMake script for compiling a CGAL application. - -set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - -find_package(CGAL) - -if ( CGAL_FOUND ) - - include( ${CGAL_USE_FILE} ) - include(CreateSingleSourceCGALProgram) - - create_single_source_cgal_program( convert_raw_image_to_inr.cpp ) - create_single_source_cgal_program( test_imageio.cpp ) - -endif() diff --git a/CGALimageIO/src/CGALimageIO/CMakeLists.txt b/CGALimageIO/src/CGALimageIO/CMakeLists.txt index 699e628d890..8f8ddd12d1e 100644 --- a/CGALimageIO/src/CGALimageIO/CMakeLists.txt +++ b/CGALimageIO/src/CGALimageIO/CMakeLists.txt @@ -39,21 +39,21 @@ if(ZLIB_FOUND AND OPENGL_FOUND) message( STATUS "ZLib include: ${ZLIB_INCLUDE_DIR}" ) message( STATUS "ZLib libraries: ${ZLIB_LIBRARY}" ) - set( CGAL_IMAGEIO_BASENAME CGAL-ImageIO ) + set( CGAL_ImageIO_BASENAME CGAL-ImageIO ) - cache_set(CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ) - cache_set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES ${ZLIB_LIBRARY} ${OPENGL_LIBRARIES} ) - cache_set(CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS "" ) + cache_set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ) + cache_set(CGAL_ImageIO_3RD_PARTY_LIBRARIES ${ZLIB_LIBRARY} ${OPENGL_LIBRARIES} ) + cache_set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS "" ) if(WITH_VTK) if( VTK_FOUND ) - message(STATUS "VTK-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} found. Build VTK support in ${CGAL_IMAGEIO_BASENAME}.") + message(STATUS "VTK-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION} found. Build VTK support in ${CGAL_ImageIO_BASENAME}.") include( ${VTK_USE_FILE} ) - cache_set(CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS ${CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS} -DCGAL_USE_VTK ) - cache_set(CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS ${CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS} ${VTK_INCLUDE_DIR} ) - cache_set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES ${CGAL_IMAGEIO_3RD_PARTY_LIBRARIES} vtkImaging vtkIO ) + cache_set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS ${CGAL_ImageIO_3RD_PARTY_DEFINITIONS} -DCGAL_USE_VTK ) + cache_set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} ${VTK_INCLUDE_DIR} ) + cache_set(CGAL_ImageIO_3RD_PARTY_LIBRARIES ${CGAL_ImageIO_3RD_PARTY_LIBRARIES} vtkImaging vtkIO ) else() message(STATUS "VTK not found.") @@ -61,52 +61,52 @@ if(ZLIB_FOUND AND OPENGL_FOUND) endif() - include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS} ) + include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS} ) - add_library(CGAL_IMAGEIO all_files.cpp) + add_library(CGAL_ImageIO all_files.cpp) - add_dependencies( CGAL_IMAGEIO CGAL ) + add_dependencies( CGAL_ImageIO CGAL ) - add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS} ) + add_definitions( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_ImageIO_3RD_PARTY_DEFINITIONS} ) - set_target_properties(CGAL_IMAGEIO PROPERTIES VERSION "${CGAL_SONAME_VERSION}" SOVERSION "${CGAL_SOVERSION}") + set_target_properties(CGAL_ImageIO PROPERTIES VERSION "${CGAL_SONAME_VERSION}" SOVERSION "${CGAL_SOVERSION}") - target_link_libraries( CGAL_IMAGEIO ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_IMAGEIO_3RD_PARTY_LIBRARIES} ) + target_link_libraries( CGAL_ImageIO ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_ImageIO_3RD_PARTY_LIBRARIES} ) if (NOT AUTO_LINK_ENABLED ) - set_target_properties( CGAL_IMAGEIO PROPERTIES OUTPUT_NAME "${CGAL_IMAGEIO_BASENAME}" ) + set_target_properties( CGAL_ImageIO PROPERTIES OUTPUT_NAME "${CGAL_ImageIO_BASENAME}" ) - get_target_property( CGAL_IMAGEIO_LIBRARY_FULL_PATH CGAL_IMAGEIO LOCATION ) + get_target_property( CGAL_ImageIO_LIBRARY_FULL_PATH CGAL_ImageIO LOCATION ) - set(CGAL_IMAGEIO_LIBRARY "${CGAL_IMAGEIO_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-ImageIO library") + set(CGAL_ImageIO_LIBRARY "${CGAL_ImageIO_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-ImageIO library") - mark_as_advanced(CGAL_IMAGEIO_LIBRARY) + mark_as_advanced(CGAL_ImageIO_LIBRARY) else() - set(CGAL_IMAGEIO_LIBRARY) + set(CGAL_ImageIO_LIBRARY) - set(CGAL_IMAGEIO_RELEASE_MANGLED_NAME "${CGAL_IMAGEIO_BASENAME}-${TOOLSET}-mt" ) - set(CGAL_IMAGEIO_DEBUG_MANGLED_NAME "${CGAL_IMAGEIO_BASENAME}-${TOOLSET}-mt-gd" ) - set(CGAL_IMAGEIO_MINSIZEREL_MANGLED_NAME "${CGAL_IMAGEIO_BASENAME}-${TOOLSET}-mt-o" ) - set(CGAL_IMAGEIO_RELWITHDEBINFO_MANGLED_NAME "${CGAL_IMAGEIO_BASENAME}-${TOOLSET}-mt-g" ) + set(CGAL_ImageIO_RELEASE_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${TOOLSET}-mt" ) + set(CGAL_ImageIO_DEBUG_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${TOOLSET}-mt-gd" ) + set(CGAL_ImageIO_MINSIZEREL_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${TOOLSET}-mt-o" ) + set(CGAL_ImageIO_RELWITHDEBINFO_MANGLED_NAME "${CGAL_ImageIO_BASENAME}-${TOOLSET}-mt-g" ) - set_target_properties( CGAL_IMAGEIO PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_IMAGEIO_DEBUG_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${CGAL_IMAGEIO_RELEASE_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${CGAL_IMAGEIO_MINSIZEREL_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${CGAL_IMAGEIO_RELWITHDEBINFO_MANGLED_NAME}" + set_target_properties( CGAL_ImageIO PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_ImageIO_DEBUG_MANGLED_NAME}" + RELEASE_OUTPUT_NAME "${CGAL_ImageIO_RELEASE_MANGLED_NAME}" + MINSIZEREL_OUTPUT_NAME "${CGAL_ImageIO_MINSIZEREL_MANGLED_NAME}" + RELWITHDEBINFO_OUTPUT_NAME "${CGAL_ImageIO_RELWITHDEBINFO_MANGLED_NAME}" ) if ( HAS_CFG_INTDIR ) - add_custom_command(TARGET CGAL_IMAGEIO POST_BUILD COMMAND copy /Y "$(TargetPath)" "$(SolutionDir)lib" ) - add_custom_command(TARGET CGAL_IMAGEIO POST_BUILD COMMAND if exist "$(TargetDir)$(TargetName).pdb" copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)lib" ) + add_custom_command(TARGET CGAL_ImageIO POST_BUILD COMMAND copy /Y "$(TargetPath)" "$(SolutionDir)lib" ) + add_custom_command(TARGET CGAL_ImageIO POST_BUILD COMMAND if exist "$(TargetDir)$(TargetName).pdb" copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)lib" ) endif() endif() if ( CGAL_INSTALL_LIB_DIR ) - install(TARGETS CGAL_IMAGEIO DESTINATION ${CGAL_INSTALL_LIB_DIR} ) + install(TARGETS CGAL_ImageIO DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() else() message( STATUS "CGAL-ImageIO needs ZLib and OpenGL, cannot be configured.") diff --git a/Installation/CGALConfig_binary.cmake.in b/Installation/CGALConfig_binary.cmake.in index dd418dd37e1..713a7dd6427 100644 --- a/Installation/CGALConfig_binary.cmake.in +++ b/Installation/CGALConfig_binary.cmake.in @@ -30,34 +30,40 @@ set(CGAL_LIBRARY "@CGAL_LIBRARY@") set(CGAL_CORE_LIBRARY "@CGAL_CORE_LIBRARY@") - set(CGAL_IMAGEIO_LIBRARY "@CGAL_IMAGEIO_LIBRARY@") + set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@") set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" ) - set(CGAL_QT_LIBRARY "@CGAL_QT_LIBRARY@" ) + set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" ) + set(CGAL_Qt4_LIBRARY "@CGAL_Qt4_LIBRARY@" ) set(CGAL_3RD_PARTY_INCLUDE_DIRS "@CGAL_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_3RD_PARTY_DEFINITIONS "@CGAL_3RD_PARTY_DEFINITIONS@" ) set(CGAL_3RD_PARTY_LIBRARIES_DIRS "@CGAL_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_3RD_PARTY_LIBRARIES "@CGAL_3RD_PARTY_LIBRARIES@" ) - + set(CGAL_CORE_3RD_PARTY_INCLUDE_DIRS "@CGAL_CORE_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_CORE_3RD_PARTY_DEFINITIONS "@CGAL_CORE_3RD_PARTY_DEFINITIONS@" ) set(CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS "@CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_CORE_3RD_PARTY_LIBRARIES "@CGAL_CORE_3RD_PARTY_LIBRARIES@" ) - set(CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS "@CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_IMAGEIO_3RD_PARTY_LIBRARIES_DIRS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES "@CGAL_IMAGEIO_3RD_PARTY_LIBRARIES@" ) + set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS "@CGAL_ImageIO_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" ) set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS "@CGAL_PDB_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_PDB_3RD_PARTY_DEFINITIONS "@CGAL_PDB_3RD_PARTY_DEFINITIONS@" ) set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "@CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_PDB_3RD_PARTY_LIBRARIES "@CGAL_PDB_3RD_PARTY_LIBRARIES@" ) - set(CGAL_QT_3RD_PARTY_INCLUDE_DIRS "@CGAL_QT_3RD_PARTY_INCLUDE_DIRS@" ) - set(CGAL_QT_3RD_PARTY_DEFINITIONS "@CGAL_QT_3RD_PARTY_DEFINITIONS@" ) - set(CGAL_QT_3RD_PARTY_LIBRARIES_DIRS "@CGAL_QT_3RD_PARTY_LIBRARIES_DIRS@" ) - set(CGAL_QT_3RD_PARTY_LIBRARIES "@CGAL_QT_3RD_PARTY_LIBRARIES@" ) + set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_Qt3_3RD_PARTY_LIBRARIES "@CGAL_Qt3_3RD_PARTY_LIBRARIES@" ) + + set(CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_Qt4_3RD_PARTY_DEFINITIONS "@CGAL_Qt4_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_Qt4_3RD_PARTY_LIBRARIES "@CGAL_Qt4_3RD_PARTY_LIBRARIES@" ) set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSION}") diff --git a/Installation/CGALConfig_install.cmake.fhs.in b/Installation/CGALConfig_install.cmake.fhs.in index 26f131578bd..2be01200dba 100644 --- a/Installation/CGALConfig_install.cmake.fhs.in +++ b/Installation/CGALConfig_install.cmake.fhs.in @@ -39,9 +39,10 @@ set(CGAL_LIBRARY "@CGAL_LIBRARY@") set(CGAL_CORE_LIBRARY "@CGAL_CORE_LIBRARY@") - set(CGAL_IMAGEIO_LIBRARY "@CGAL_IMAGEIO_LIBRARY@") + set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@") set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" ) - set(CGAL_QT_LIBRARY "@CGAL_QT_LIBRARY@" ) + set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" ) + set(CGAL_Qt4_LIBRARY "@CGAL_Qt4_LIBRARY@" ) set(CGAL_3RD_PARTY_INCLUDE_DIRS "@CGAL_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_3RD_PARTY_DEFINITIONS "@CGAL_3RD_PARTY_DEFINITIONS@" ) @@ -53,20 +54,25 @@ set(CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS "@CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_CORE_3RD_PARTY_LIBRARIES "@CGAL_CORE_3RD_PARTY_LIBRARIES@" ) - set(CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS "@CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_IMAGEIO_3RD_PARTY_LIBRARIES_DIRS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES "@CGAL_IMAGEIO_3RD_PARTY_LIBRARIES@" ) + set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS "@CGAL_ImageIO_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" ) set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS "@CGAL_PDB_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_PDB_3RD_PARTY_DEFINITIONS "@CGAL_PDB_3RD_PARTY_DEFINITIONS@" ) set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "@CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_PDB_3RD_PARTY_LIBRARIES "@CGAL_PDB_3RD_PARTY_LIBRARIES@" ) - set(CGAL_QT_3RD_PARTY_INCLUDE_DIRS "@CGAL_QT_3RD_PARTY_INCLUDE_DIRS@" ) - set(CGAL_QT_3RD_PARTY_DEFINITIONS "@CGAL_QT_3RD_PARTY_DEFINITIONS@" ) - set(CGAL_QT_3RD_PARTY_LIBRARIES_DIRS "@CGAL_QT_3RD_PARTY_LIBRARIES_DIRS@" ) - set(CGAL_QT_3RD_PARTY_LIBRARIES "@CGAL_QT_3RD_PARTY_LIBRARIES@" ) + set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_Qt3_3RD_PARTY_LIBRARIES "@CGAL_Qt3_3RD_PARTY_LIBRARIES@" ) + + set(CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_Qt4_3RD_PARTY_DEFINITIONS "@CGAL_Qt4_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_Qt4_3RD_PARTY_LIBRARIES "@CGAL_Qt4_3RD_PARTY_LIBRARIES@" ) set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSION}") diff --git a/Installation/CGALConfig_install.cmake.source.in b/Installation/CGALConfig_install.cmake.source.in index 0575c7705d5..b6c1a66178c 100644 --- a/Installation/CGALConfig_install.cmake.source.in +++ b/Installation/CGALConfig_install.cmake.source.in @@ -35,9 +35,10 @@ set(CGAL_LIBRARY "@CGAL_LIBRARY@") set(CGAL_CORE_LIBRARY "@CGAL_CORE_LIBRARY@") - set(CGAL_IMAGEIO_LIBRARY "@CGAL_IMAGEIO_LIBRARY@") + set(CGAL_ImageIO_LIBRARY "@CGAL_ImageIO_LIBRARY@") set(CGAL_PDB_LIBRARY "@CGAL_PDB_LIBRARY@" ) - set(CGAL_QT_LIBRARY "@CGAL_QT_LIBRARY@" ) + set(CGAL_Qt3_LIBRARY "@CGAL_Qt3_LIBRARY@" ) + set(CGAL_Qt4_LIBRARY "@CGAL_Qt4_LIBRARY@" ) set(CGAL_3RD_PARTY_INCLUDE_DIRS "@CGAL_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_3RD_PARTY_DEFINITIONS "@CGAL_3RD_PARTY_DEFINITIONS@" ) @@ -49,20 +50,25 @@ set(CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS "@CGAL_CORE_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_CORE_3RD_PARTY_LIBRARIES "@CGAL_CORE_3RD_PARTY_LIBRARIES@" ) - set(CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS "@CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_IMAGEIO_3RD_PARTY_LIBRARIES_DIRS@" ) - set(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES "@CGAL_IMAGEIO_3RD_PARTY_LIBRARIES@" ) + set(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS "@CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_ImageIO_3RD_PARTY_DEFINITIONS "@CGAL_ImageIO_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS "@CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_ImageIO_3RD_PARTY_LIBRARIES "@CGAL_ImageIO_3RD_PARTY_LIBRARIES@" ) set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS "@CGAL_PDB_3RD_PARTY_INCLUDE_DIRS@" ) set(CGAL_PDB_3RD_PARTY_DEFINITIONS "@CGAL_PDB_3RD_PARTY_DEFINITIONS@" ) set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "@CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS@" ) set(CGAL_PDB_3RD_PARTY_LIBRARIES "@CGAL_PDB_3RD_PARTY_LIBRARIES@" ) - set(CGAL_QT_3RD_PARTY_INCLUDE_DIRS "@CGAL_QT_3RD_PARTY_INCLUDE_DIRS@" ) - set(CGAL_QT_3RD_PARTY_DEFINITIONS "@CGAL_QT_3RD_PARTY_DEFINITIONS@" ) - set(CGAL_QT_3RD_PARTY_LIBRARIES_DIRS "@CGAL_QT_3RD_PARTY_LIBRARIES_DIRS@" ) - set(CGAL_QT_3RD_PARTY_LIBRARIES "@CGAL_QT_3RD_PARTY_LIBRARIES@" ) + set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_Qt3_3RD_PARTY_DEFINITIONS "@CGAL_Qt3_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt3_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_Qt3_3RD_PARTY_LIBRARIES "@CGAL_Qt3_3RD_PARTY_LIBRARIES@" ) + + set(CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS "@CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS@" ) + set(CGAL_Qt4_3RD_PARTY_DEFINITIONS "@CGAL_Qt4_3RD_PARTY_DEFINITIONS@" ) + set(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS "@CGAL_Qt4_3RD_PARTY_LIBRARIES_DIRS@" ) + set(CGAL_Qt4_3RD_PARTY_LIBRARIES "@CGAL_Qt4_3RD_PARTY_LIBRARIES@" ) set(CGAL_VERSION "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUILD_VERSION}") diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt index 3f683923111..76baf8fc4da 100644 --- a/Installation/CMakeLists.txt +++ b/Installation/CMakeLists.txt @@ -234,9 +234,10 @@ add_subdirectory(src) cache_get(CGAL_LIBRARY) cache_get(CGAL_CORE_LIBRARY) -cache_get(CGAL_IMAGEIO_LIBRARY) +cache_get(CGAL_ImageIO_LIBRARY) cache_get(CGAL_PDB_LIBRARY) -cache_get(CGAL_QT_LIBRARY) +cache_get(CGAL_Qt3_LIBRARY) +cache_get(CGAL_Qt4_LIBRARY) cache_get(CGAL_3RD_PARTY_DEFINITIONS ) cache_get(CGAL_3RD_PARTY_INCLUDE_DIRS ) @@ -248,15 +249,20 @@ cache_get(CGAL_CORE_3RD_PARTY_INCLUDE_DIRS ) cache_get(CGAL_CORE_3RD_PARTY_LIBRARIES ) cache_get(CGAL_CORE_3RD_PARTY_LIBRARIES_DIR) -cache_get(CGAL_IMAGEIO_3RD_PARTY_DEFINITIONS ) -cache_get(CGAL_IMAGEIO_3RD_PARTY_INCLUDE_DIRS ) -cache_get(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES ) -cache_get(CGAL_IMAGEIO_3RD_PARTY_LIBRARIES_DIR) +cache_get(CGAL_ImageIO_3RD_PARTY_DEFINITIONS ) +cache_get(CGAL_ImageIO_3RD_PARTY_INCLUDE_DIRS ) +cache_get(CGAL_ImageIO_3RD_PARTY_LIBRARIES ) +cache_get(CGAL_ImageIO_3RD_PARTY_LIBRARIES_DIR) -cache_get(CGAL_QT_3RD_PARTY_DEFINITIONS ) -cache_get(CGAL_QT_3RD_PARTY_INCLUDE_DIRS ) -cache_get(CGAL_QT_3RD_PARTY_LIBRARIES ) -cache_get(CGAL_QT_3RD_PARTY_LIBRARIES_DIR) +cache_get(CGAL_Qt3_3RD_PARTY_DEFINITIONS ) +cache_get(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS ) +cache_get(CGAL_Qt3_3RD_PARTY_LIBRARIES ) +cache_get(CGAL_Qt3_3RD_PARTY_LIBRARIES_DIR) + +cache_get(CGAL_Qt4_3RD_PARTY_DEFINITIONS ) +cache_get(CGAL_Qt4_3RD_PARTY_INCLUDE_DIRS ) +cache_get(CGAL_Qt4_3RD_PARTY_LIBRARIES ) +cache_get(CGAL_Qt4_3RD_PARTY_LIBRARIES_DIR) cache_get(CGAL_PDB_3RD_PARTY_DEFINITIONS ) cache_get(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS ) @@ -300,13 +306,13 @@ if ( WITH_INSTALL ) ) - install(DIRECTORY include/CGAL DESTINATION ${CGAL_INSTALL_INC_DIR} ) - install(DIRECTORY "${CMAKE_BINARY_DIR}/include/CGAL" DESTINATION ${CGAL_INSTALL_INC_DIR} ) + install(DIRECTORY include/CGAL DESTINATION ${CGAL_INSTALL_INC_DIR} ) + install(DIRECTORY "${CMAKE_BINARY_DIR}/include/CGAL" DESTINATION ${CGAL_INSTALL_INC_DIR} ) - install(DIRECTORY scripts/ DESTINATION ${CGAL_INSTALL_BIN_DIR} ) + install(DIRECTORY scripts/ DESTINATION ${CGAL_INSTALL_BIN_DIR} ) - install(DIRECTORY cmake/modules/ DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) - install(FILES cmake/modules/UseCGAL.cmake DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) + install(DIRECTORY cmake/modules/ DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) + install(FILES cmake/modules/UseCGAL.cmake DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) if ( GMP_IN_AUXILIARY ) install(DIRECTORY auxiliary/gmp/include/ DESTINATION ${CGAL_INSTALL_INC_DIR} ) @@ -326,9 +332,9 @@ if ( WITH_INSTALL ) if ( SOURCE_INSTALL ) install(FILES ${CMAKE_BINARY_DIR}/cmake/CGALConfig.cmake DESTINATION ${CGAL_INSTALL_ROOT_DIR} ) - install(FILES CMakeLists.txt DESTINATION ${CGAL_INSTALL_ROOT_DIR} ) - install(DIRECTORY auxiliary DESTINATION ${CGAL_INSTALL_ROOT_DIR} ) - install(DIRECTORY src DESTINATION ${CGAL_INSTALL_ROOT_DIR} ) + install(FILES CMakeLists.txt DESTINATION ${CGAL_INSTALL_ROOT_DIR} ) + install(DIRECTORY auxiliary DESTINATION ${CGAL_INSTALL_ROOT_DIR} ) + install(DIRECTORY src DESTINATION ${CGAL_INSTALL_ROOT_DIR} ) else() install(FILES ${CMAKE_BINARY_DIR}/cmake/CGALConfig.cmake DESTINATION ${CGAL_INSTALL_CMAKE_DIR} ) endif() @@ -344,16 +350,16 @@ endif() macro( add_programs subdir ON_OFF ) - cache_set( CGAL_EXECUTABLES "" ) + cache_set( CGAL_EXECUTABLE_TARGETS "" ) add_custom_target( ${subdir} ) optional_add_subdirectory( ${subdir} ${ON_OFF} EXCLUDE_FROM_ALL ) - cache_get( CGAL_EXECUTABLES ) + cache_get( CGAL_EXECUTABLE_TARGETS ) - foreach( CGAL_EXECUTABLE in ${CGAL_EXECUTABLES} ) - add_dependencies( ${subdir} ${CGAL_EXECUTABLE} ) + foreach( CGAL_EXECUTABLE_TARGET in ${CGAL_EXECUTABLE_TARGETS} ) + add_dependencies( ${subdir} ${CGAL_EXECUTABLE_TARGET} ) endforeach() endmacro() diff --git a/Installation/cmake/modules/CreateSingleSourceCGALProgram.cmake b/Installation/cmake/modules/CreateSingleSourceCGALProgram.cmake index bc941023c2a..b89d8aefef9 100644 --- a/Installation/cmake/modules/CreateSingleSourceCGALProgram.cmake +++ b/Installation/cmake/modules/CreateSingleSourceCGALProgram.cmake @@ -1,4 +1,4 @@ -macro(create_single_source_cgal_program first ) +macro(create_single_source_cgal_program prefix first ) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${first}) @@ -10,15 +10,18 @@ macro(create_single_source_cgal_program first ) get_filename_component(exe_name ${first} NAME_WE) - add_executable(${exe_name} ${all}) + set( target_name "${prefix}_${exe_name}" ) - add_to_cached_list( CGAL_EXECUTABLES ${exe_name} ) + add_executable(${target_name} ${all}) + + set( CGAL_EXECUTABLE_TARGETS ) + set( CGAL_EXECUTABLE_TARGETS "${CGAL_EXECUTABLE_TARGETS}" "${target_name}" CACHE INTERNAL "" FORCE ) # Link the executable to CGAL and third-party libraries if ( AUTO_LINK_ENABLED ) - target_link_libraries(${exe_name} ${CGAL_3RD_PARTY_LIBRARIES} ) + target_link_libraries(${target_name} ${CGAL_3RD_PARTY_LIBRARIES} ) else() - target_link_libraries(${exe_name} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_LIBRARIES} ) + target_link_libraries(${target_name} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_LIBRARIES} ) endif() endif() diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake index 9a8f86b3d05..6d2bbc337d5 100644 --- a/Installation/cmake/modules/UseCGAL.cmake +++ b/Installation/cmake/modules/UseCGAL.cmake @@ -26,11 +26,11 @@ if(NOT USE_CGAL_FILE_INCLUDED) foreach ( CGAL_COMPONENT ${CGAL_FIND_COMPONENTS} ) - set( CGAL_LIBRARIES ${CGAL_LIBRARIES} ${${CGAL_COMPONENT}_LIBRARY} ) - set( CGAL_3RD_PARTY_INCLUDE_DIRS ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${${CGAL_COMPONENT}_3RD_PARTY_INCLUDE_DIRS} ) - set( CGAL_3RD_PARTY_DEFINITIONS ${CGAL_3RD_PARTY_DEFINITIONS} ${${CGAL_COMPONENT}_3RD_PARTY_DEFINITIONS} ) - set( CGAL_3RD_PARTY_LIBRARIES_DIRS ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ${${CGAL_COMPONENT}_3RD_PARTY_LIBRARIES_DIRS} ) - set( CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES} ${${CGAL_COMPONENT}_3RD_PARTY_LIBRARIES} ) + set( CGAL_LIBRARIES ${CGAL_LIBRARIES} ${CGAL_${CGAL_COMPONENT}_LIBRARY} ) + set( CGAL_3RD_PARTY_INCLUDE_DIRS ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_${CGAL_COMPONENT}_3RD_PARTY_INCLUDE_DIRS} ) + set( CGAL_3RD_PARTY_DEFINITIONS ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_${CGAL_COMPONENT}_3RD_PARTY_DEFINITIONS} ) + set( CGAL_3RD_PARTY_LIBRARIES_DIRS ${CGAL_3RD_PARTY_LIBRARIES_DIRS} ${CGAL_${CGAL_COMPONENT}_3RD_PARTY_LIBRARIES_DIRS} ) + set( CGAL_3RD_PARTY_LIBRARIES ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_${CGAL_COMPONENT}_3RD_PARTY_LIBRARIES} ) endforeach() diff --git a/Qt_widget/src/CGALQt/CMakeLists.txt b/Qt_widget/src/CGALQt/CMakeLists.txt index 91d78cd96ab..0f9a8837b15 100644 --- a/Qt_widget/src/CGALQt/CMakeLists.txt +++ b/Qt_widget/src/CGALQt/CMakeLists.txt @@ -26,8 +26,8 @@ if( QT_FOUND AND OPENGL_FOUND ) get_dependency_version(OPENGL OpenGL) get_dependency_version(QT) - set( CGAL_USE_QT TRUE ) - add_config_flag( CGAL_USE_QT ) + set( CGAL_USE_QT3 TRUE ) + add_config_flag( CGAL_USE_QT3 ) message( STATUS "OpenGL include: ${OPENGL_INCLUDE_DIR}" ) message( STATUS "OpenGL libraries: ${OPENGL_LIBRARIES}" ) @@ -38,13 +38,13 @@ if( QT_FOUND AND OPENGL_FOUND ) message( STATUS "moc executable: ${QT_MOC_EXECUTABLE}" ) message( STATUS "uic executable: ${QT_UIC_EXECUTABLE}" ) - cache_set(CGAL_QT_3RD_PARTY_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ) - cache_set(CGAL_QT_3RD_PARTY_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ) - cache_set(CGAL_QT_3RD_PARTY_DEFINITIONS ${QT_DEFINITIONS} ${OPENGL_DEFINITIONS} ) + cache_set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ) + cache_set(CGAL_Qt3_3RD_PARTY_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ) + cache_set(CGAL_Qt3_3RD_PARTY_DEFINITIONS ${QT_DEFINITIONS} ${OPENGL_DEFINITIONS} ) include(Qt3Macros) - include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_QT_3RD_PARTY_INCLUDE_DIRS} ) + include_directories( ${CGAL_3RD_PARTY_INCLUDE_DIRS} ${CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS} ) # Make sure the compiler can find generated .moc files include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR}) @@ -88,55 +88,55 @@ if( QT_FOUND AND OPENGL_FOUND ) add_file_dependencies(all_files.cpp ${CMAKE_CURRENT_BINARY_DIR}/Qt_widget_history.moc ) add_file_dependencies(all_files.cpp ${CMAKE_CURRENT_BINARY_DIR}/Qt_widget_OpenGL.moc ) - add_library (CGAL_QT "all_files.cpp") + add_library (CGAL_Qt3 "all_files.cpp") - add_dependencies( CGAL_QT CGAL ) + add_dependencies( CGAL_Qt3 CGAL ) - set_target_properties(CGAL_QT PROPERTIES VERSION "${CGAL_SONAME_VERSION}" SOVERSION "${CGAL_SOVERSION}") + set_target_properties(CGAL_Qt3 PROPERTIES VERSION "${CGAL_SONAME_VERSION}" SOVERSION "${CGAL_SOVERSION}") - target_link_libraries( CGAL_QT ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_QT_3RD_PARTY_LIBRARIES} ) + target_link_libraries( CGAL_Qt3 ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_Qt3_3RD_PARTY_LIBRARIES} ) - add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_QT_3RD_PARTY_DEFINITIONS} ) + add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt3_3RD_PARTY_DEFINITIONS} ) - set( CGAL_QT_BASENAME CGAL-Qt ) + set( CGAL_Qt3_BASENAME CGAL-Qt3 ) if (NOT AUTO_LINK_ENABLED ) - set_target_properties( CGAL_QT PROPERTIES OUTPUT_NAME "${CGAL_QT_BASENAME}" ) + set_target_properties( CGAL_Qt3 PROPERTIES OUTPUT_NAME "${CGAL_Qt3_BASENAME}" ) - get_target_property( CGAL_QT_LIBRARY_FULL_PATH CGAL_QT LOCATION ) + get_target_property( CGAL_Qt3_LIBRARY_FULL_PATH CGAL_Qt3 LOCATION ) - set(CGAL_QT_LIBRARY "${CGAL_QT_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-Qt library") + set(CGAL_Qt3_LIBRARY "${CGAL_Qt3_LIBRARY_FULL_PATH}" CACHE STRING "The CGAL-Qt3 library") - mark_as_advanced(CGAL_QT_LIBRARY) + mark_as_advanced(CGAL_Qt3_LIBRARY) else() - set(CGAL_QT_LIBRARY) + set(CGAL_Qt3_LIBRARY) - set(CGAL_QT_RELEASE_MANGLED_NAME "${CGAL_QT_BASENAME}-${TOOLSET}-mt" ) - set(CGAL_QT_DEBUG_MANGLED_NAME "${CGAL_QT_BASENAME}-${TOOLSET}-mt-gd" ) - set(CGAL_QT_MINSIZEREL_MANGLED_NAME "${CGAL_QT_BASENAME}-${TOOLSET}-mt-o" ) - set(CGAL_QT_RELWITHDEBINFO_MANGLED_NAME "${CGAL_QT_BASENAME}-${TOOLSET}-mt-g" ) + set(CGAL_Qt3_RELEASE_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${TOOLSET}-mt" ) + set(CGAL_Qt3_DEBUG_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${TOOLSET}-mt-gd" ) + set(CGAL_Qt3_MINSIZEREL_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${TOOLSET}-mt-o" ) + set(CGAL_Qt3_RELWITHDEBINFO_MANGLED_NAME "${CGAL_Qt3_BASENAME}-${TOOLSET}-mt-g" ) - set_target_properties( CGAL_QT PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_QT_DEBUG_MANGLED_NAME}" - RELEASE_OUTPUT_NAME "${CGAL_QT_RELEASE_MANGLED_NAME}" - MINSIZEREL_OUTPUT_NAME "${CGAL_QT_MINSIZEREL_MANGLED_NAME}" - RELWITHDEBINFO_OUTPUT_NAME "${CGAL_QT_RELWITHDEBINFO_MANGLED_NAME}" + set_target_properties( CGAL_Qt3 PROPERTIES DEBUG_OUTPUT_NAME "${CGAL_Qt3_DEBUG_MANGLED_NAME}" + RELEASE_OUTPUT_NAME "${CGAL_Qt3_RELEASE_MANGLED_NAME}" + MINSIZEREL_OUTPUT_NAME "${CGAL_Qt3_MINSIZEREL_MANGLED_NAME}" + RELWITHDEBINFO_OUTPUT_NAME "${CGAL_Qt3_RELWITHDEBINFO_MANGLED_NAME}" ) if ( HAS_CFG_INTDIR ) - add_custom_command(TARGET CGAL_QT POST_BUILD COMMAND copy /Y "$(TargetPath)" "$(SolutionDir)lib" ) - add_custom_command(TARGET CGAL_QT POST_BUILD COMMAND if exist "$(TargetDir)$(TargetName).pdb" copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)lib" ) + add_custom_command(TARGET CGAL_Qt3 POST_BUILD COMMAND copy /Y "$(TargetPath)" "$(SolutionDir)lib" ) + add_custom_command(TARGET CGAL_Qt3 POST_BUILD COMMAND if exist "$(TargetDir)$(TargetName).pdb" copy /Y "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)lib" ) endif() endif() if ( CGAL_INSTALL_LIB_DIR ) - install(TARGETS CGAL_QT DESTINATION ${CGAL_INSTALL_LIB_DIR} ) + install(TARGETS CGAL_Qt3 DESTINATION ${CGAL_INSTALL_LIB_DIR} ) endif() else() - message( STATUS "CGAL-Qt needs Qt3, cannot be configured.") + message( STATUS "CGAL-Qt3 needs Qt3, cannot be configured.") endif() diff --git a/Scripts/developer_scripts/create_internal_release b/Scripts/developer_scripts/create_internal_release index 53c3ab6b1c0..ef8ce4cd0b5 100755 --- a/Scripts/developer_scripts/create_internal_release +++ b/Scripts/developer_scripts/create_internal_release @@ -414,7 +414,7 @@ sub make_testscripts() sub generate_cmake_scripts { - my $is_demo = $_[0]; + my $options = $_[0]; foreach $DIR (glob("*")) { @@ -426,8 +426,6 @@ sub generate_cmake_scripts { $_ = $DIR; - my $options = /_Demo$/ || $is_demo ? '-q' : '' ; - if ( -f 'cgal_create_cmake_script_options') { if (open(OPTIONS, "/dev/null | sort` ; do - # Create an executable for each cpp that contains a function "main()" - BASE=`basename $file .C` - BASE=`basename $BASE .cpp` - egrep '\bmain[ \t]*\(' $file >/dev/null 2>&1 - if [ $? -eq 0 ]; then - exe_name=$BASE - fi all="$all $file" done @@ -85,21 +76,21 @@ create_cmake_script() fi echo - echo "add_executable (${exe_name} ${all})" + echo "add_executable (${target_name} ${all})" echo - echo "add_to_cached_list( CGAL_EXECUTABLES ${exe_name} )" + echo "add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${target_name} )" echo echo '# Link the executable to CGAL and third-party libraries' echo 'if ( AUTO_LINK_ENABLED )' - echo " target_link_libraries(${exe_name}"' ${QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )' + echo " target_link_libraries(${target_name}"' ${QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )' echo 'else()' - echo " target_link_libraries(${exe_name}" ' ${QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_LIBRARIES} )' + echo " target_link_libraries(${target_name}" ' ${QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_LIBRARIES} )' echo 'endif()' else - echo 'find_package(CGAL REQUIRED CGAL_CORE )' + echo 'find_package(CGAL REQUIRED CORE )' echo echo echo 'include( ${CGAL_USE_FILE} )' @@ -117,7 +108,7 @@ create_cmake_script() BASE=`basename $BASE .cpp` egrep '\bmain[ \t]*\(' $file >/dev/null 2>&1 if [ $? -eq 0 ]; then - echo "create_single_source_cgal_program( $file )" + echo "create_single_source_cgal_program( \"${PROJECT}_${TYPE}\" \"$file\" )" fi done fi @@ -129,27 +120,31 @@ create_cmake_script() usage() { - echo "Usage: cgal_create_cmake_script [-options]" - echo - echo "-q create a CGAL CMake script with Qt support" + echo "Usage: cgal_create_cmake_script [TYPE]" + echo + echo " TYPE must be any of example, demo or test." + echo " Defaukt is example." + echo } case $# in - 0) ;; - 1) ;; + 0) TYPE="example";; + 1) TYPE=$1;; *) usage exit 1 esac -for i do - case $i in - -q) QT='y';; - *) usage - exit 1;; - esac -done + +if [ "${TYPE}" = "example" -o "${TYPE}" = "demo" -o "${TYPE}" = "test" ]; then + ok='y' +fi + +if [ -z "$ok" ]; then + echo "Invalid type: ${TYPE}. Valid values are example, demo or test" + exit 1 +fi OUTPUTFILE=CMakeLists.txt PROJECT=`basename $PWD`