diff --git a/CMake/External_ITK.cmake b/CMake/External_ITK.cmake index 3817b431c31507bf276ce35e62ac6639d7a5cce0..2312006ab82e6e7cd62b82bb66f04f7ef3ddf95f 100644 --- a/CMake/External_ITK.cmake +++ b/CMake/External_ITK.cmake @@ -132,51 +132,32 @@ else() # TODO : handle different build type (Release/Debug) - if(USE_SYSTEM_TIFF) - set(ITK_SB_TIFF_CONFIG) + if(USE_SYSTEM_TIFF) + # TODO : handle specific prefix else() - set(ITK_SB_TIFF_CONFIG - -DTIFF_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DTIFF_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libtiff${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES TIFF) endif() - if(USE_SYSTEM_EXPAT) - set(ITK_SB_EXPAT_CONFIG) + if(USE_SYSTEM_EXPAT) + # TODO : handle specific prefix else() - set(ITK_SB_EXPAT_CONFIG - -DEXPAT_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DEXPAT_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libexpat${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES EXPAT) endif() - if(USE_SYSTEM_PNG) - set(ITK_SB_PNG_CONFIG) + if(USE_SYSTEM_PNG) + # TODO : handle specific prefix else() - set(ITK_SB_PNG_CONFIG - -DPNG_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DPNG_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libpng${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES EXPAT) endif() - if(USE_SYSTEM_ZLIB) - set(ITK_SB_ZLIB_CONFIG) + if(USE_SYSTEM_ZLIB) + # TODO : handle specific prefix else() - set(ITK_SB_ZLIB_CONFIG - -DZLIB_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DZLIB_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libz${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES ZLIB) endif() if(MSVC) - set(ITK_SB_ZLIB_CONFIG) - set(ITK_SB_EXPAT_CONFIG) - set(ITK_SB_TIFF_CONFIG) - set(ITK_SB_PNG_CONFIG) + endif() ExternalProject_Add(${proj} @@ -195,15 +176,12 @@ else() -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF + -DCMAKE_PREFIX_PATH:STRING=${CMAKE_INSTALL_PREFIX} -DITK_USE_SYSTEM_EXPAT:BOOL=ON -DITK_USE_SYSTEM_ZLIB:BOOL=ON -DITK_USE_SYSTEM_TIFF:BOOL=ON -DITK_USE_SYSTEM_PNG:BOOL=ON ${ITK_SB_FFTW_CONFIG} - ${ITK_SB_TIFF_CONFIG} - ${ITK_SB_EXPAT_CONFIG} - ${ITK_SB_ZLIB_CONFIG} - ${ITK_SB_PNG_CONFIG} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/ITK/hashtable.hxx.in ${ITK_SB_SRC_DIR}/Modules/ThirdParty/KWSys/src/KWSys diff --git a/CMake/External_OpenCV.cmake b/CMake/External_OpenCV.cmake index c9b7c293cd52375d8a54b456cd36f5dbd63be346..ca132f62e8c68e3a5c62953a39a6e77d2a44deb7 100644 --- a/CMake/External_OpenCV.cmake +++ b/CMake/External_OpenCV.cmake @@ -29,6 +29,7 @@ else() CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release + -DCMAKE_PREFIX_PATH:STRING=${CMAKE_INSTALL_PREFIX} -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_DOCS:BOOL=OFF -DBUILD_EXAMPLES:BOOL=OFF diff --git a/CMake/External_curl.cmake b/CMake/External_curl.cmake index d5532741844991f4409dab278d9ab109d9d4067b..72e75e2b5613d4f14e124132a4e10e1187f58d3f 100644 --- a/CMake/External_curl.cmake +++ b/CMake/External_curl.cmake @@ -58,4 +58,4 @@ else() endif() message(STATUS " Using cURL SuperBuild version") -endif() \ No newline at end of file +endif() diff --git a/CMake/External_libKML.cmake b/CMake/External_libKML.cmake index e58bfb8d12c4f9bd7c82a4ac267cba9c231954cf..47025da65ad1a18c4b90c2adaf75a7e9d5e37c36 100644 --- a/CMake/External_libKML.cmake +++ b/CMake/External_libKML.cmake @@ -31,27 +31,16 @@ else() endif() if(USE_SYSTEM_BOOST) - set(LIBKML_SB_BOOST_CONFIG) + # TODO : handle specific prefix else() - set(LIBKML_SB_BOOST_CONFIG - -DBOOST_ROOT:STRING=${CMAKE_INSTALL_PREFIX} - ) list(APPEND ${proj}_DEPENDENCIES BOOST) endif() if(USE_SYSTEM_ZLIB) - set(LIBKML_SB_ZLIB_CONFIG) + # TODO : handle specific prefix else() - set(LIBKML_SB_ZLIB_CONFIG - -DZLIB_ROOT:STRING=${CMAKE_INSTALL_PREFIX} - ) list(APPEND ${proj}_DEPENDENCIES ZLIB) endif() - - if(MSVC) - set(LIBKML_SB_BOOST_CONFIG) - set(LIBKML_SB_ZLIB_CONFIG) - endif() ExternalProject_Add(${proj} PREFIX ${proj} @@ -65,9 +54,8 @@ else() -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON + -DCMAKE_PREFIX_PATH:STRING=${CMAKE_INSTALL_PREFIX} ${LIBKML_SB_EXPAT_CONFIG} - ${LIBKML_SB_BOOST_CONFIG} - ${LIBKML_SB_ZLIB_CONFIG} ) message(STATUS " Using libKML SuperBuild version") diff --git a/CMake/External_ossim.cmake b/CMake/External_ossim.cmake index 5b2a7b8ec6f5e866d1abc339e67fae4dbeb6f770..8e4c8519adbd2b3eec5686630abfbca88268f7f7 100644 --- a/CMake/External_ossim.cmake +++ b/CMake/External_ossim.cmake @@ -23,52 +23,32 @@ else() # set project dependencies (GEOS, GDAL, TIFF, JPEG, OPENTHREADS, ) if(USE_SYSTEM_TIFF) - set(OSSIM_SB_TIFF_CONFIG) + # TODO : handle specific prefix else() - set(OSSIM_SB_TIFF_CONFIG - -DTIFF_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DTIFF_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libtiff${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES TIFF) endif() if(USE_SYSTEM_GEOTIFF) - set(OSSIM_SB_GEOTIFF_CONFIG) + # TODO : handle specific prefix else() - set(OSSIM_SB_GEOTIFF_CONFIG - -DGEOTIFF_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DGEOTIFF_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libgeotiff${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES GEOTIFF) endif() if(USE_SYSTEM_GEOS) - set(OSSIM_SB_GEOS_CONFIG) + # TODO : handle specific prefix else() - set(OSSIM_SB_GEOS_CONFIG - -DGEOS_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libgeos${CMAKE_SHARED_LIBRARY_SUFFIX} - -DGEOS_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include/geos - ) list(APPEND ${proj}_DEPENDENCIES GEOS) endif() if(USE_SYSTEM_JPEG) - set(OSSIM_SB_JPEG_CONFIG) + # TODO : handle specific prefix else() - set(OSSIM_SB_JPEG_CONFIG - -DJPEG_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DJPEG_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libjpeg${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES JPEG) endif() if(USE_SYSTEM_OPENTHREADS) - set(OSSIM_SB_OPENTHREADS_CONFIG) + # TODO : handle specific prefix else() - set(OSSIM_SB_OPENTHREADS_CONFIG - -DOPENTHREADS_INCLUDE_DIR:STRING=${CMAKE_INSTALL_PREFIX}/include - -DOPENTHREADS_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libOpenThreads${CMAKE_SHARED_LIBRARY_SUFFIX} - ) list(APPEND ${proj}_DEPENDENCIES OPENTHREADS) endif() @@ -86,11 +66,6 @@ else() if(MSVC) set(OSSIM_CXX_FLAGS /EHsc) - set(OSSIM_SB_TIFF_CONFIG) - set(OSSIM_SB_GEOS_CONFIG) - set(OSSIM_SB_JPEG_CONFIG) - set(OSSIM_SB_OPENTHREADS_CONFIG) - set(OSSIM_SB_GEOTIFF_CONFIG) endif() ExternalProject_Add(${proj} @@ -104,13 +79,9 @@ else() -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=${OSSIM_CXX_FLAGS} - ${OSSIM_SB_TIFF_CONFIG} - ${OSSIM_SB_GEOTIFF_CONFIG} - ${OSSIM_SB_GEOS_CONFIG} - ${OSSIM_SB_JPEG_CONFIG} - ${OSSIM_SB_OPENTHREADS_CONFIG} -DBUILD_OSSIM_MPI_SUPPORT:BOOL=OFF - -DBUILD_OSSIM_APPS:BOOL=OFF + -DBUILD_OSSIM_APPS:BOOL=OFF + -DCMAKE_PREFIX_PATH:STRING=${CMAKE_INSTALL_PREFIX} DEPENDS ${${proj}_DEPENDENCIES} CMAKE_COMMAND ${SB_CMAKE_COMMAND} )