diff --git a/Superbuild/CMake/External_boost.cmake b/Superbuild/CMake/External_boost.cmake index 8bbd5e5cd755773b2e6ca17cbfd08038a2a53f1c..64666c2a7eb49bb2aead947fdfcc73298c7200aa 100644 --- a/Superbuild/CMake/External_boost.cmake +++ b/Superbuild/CMake/External_boost.cmake @@ -133,8 +133,8 @@ else() endif() #end else MSVC - set(Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) - set(Boost_LIBRARY_DIR ${SB_INSTALL_PREFIX}/lib) + set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_Boost_LIBRARY_DIR ${SB_INSTALL_PREFIX}/lib) endif() diff --git a/Superbuild/CMake/External_curl.cmake b/Superbuild/CMake/External_curl.cmake index d90f9ad245311eccd539d24193798bbfcf72eea6..05ea1c14f27342c68df1556f09e4478b3e3bed4e 100644 --- a/Superbuild/CMake/External_curl.cmake +++ b/Superbuild/CMake/External_curl.cmake @@ -58,11 +58,11 @@ else() ) endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/bin/libcurl.dll) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/bin/libcurl.dll) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libcurl${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libcurl${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_expat.cmake b/Superbuild/CMake/External_expat.cmake index 66305893ad260b865a273ee2d11e8ba939122ec4..7de84dc0377acec84e51c2f841251bce0c9ba313 100644 --- a/Superbuild/CMake/External_expat.cmake +++ b/Superbuild/CMake/External_expat.cmake @@ -29,11 +29,11 @@ else() CMAKE_COMMAND ${SB_CMAKE_COMMAND} ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/expat.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/expat.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libexpat${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libexpat${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_fftw.cmake b/Superbuild/CMake/External_fftw.cmake index f1e13fe9f264ca2a8d5804ad55ad8a5bc7d17f80..6feb62c4e0afa978dfa70c90c5ffce4f1060070f 100644 --- a/Superbuild/CMake/External_fftw.cmake +++ b/Superbuild/CMake/External_fftw.cmake @@ -74,7 +74,7 @@ else() add_custom_target(${proj}) add_dependencies(${proj} ${projDouble} ${projFloat}) - set(${proj}_INCLUDE_PATH ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_PATH ${SB_INSTALL_PREFIX}/include) endif() diff --git a/Superbuild/CMake/External_gdal.cmake b/Superbuild/CMake/External_gdal.cmake index 4c5796f19119f73950f2e0d88586c4885f611437..77b032a71d682f10929609e0d09068ca4d7bf51a 100644 --- a/Superbuild/CMake/External_gdal.cmake +++ b/Superbuild/CMake/External_gdal.cmake @@ -93,11 +93,11 @@ else() endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/bin/gdal111.dll) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/bin/gdal111.dll) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libgdal${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libgdal${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_geos.cmake b/Superbuild/CMake/External_geos.cmake index 551a838a030af6642ebe7cf99e53ce69579650d3..16b3b9aa1d0c79d72e8f7201d729f83f73892f7b 100644 --- a/Superbuild/CMake/External_geos.cmake +++ b/Superbuild/CMake/External_geos.cmake @@ -30,11 +30,11 @@ else() CMAKE_COMMAND ${SB_CMAKE_COMMAND} ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/bin/geos.dll) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/bin/geos.dll) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libgeos${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libgeos${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_geotiff.cmake b/Superbuild/CMake/External_geotiff.cmake index b282e7edb9bf1f8a25b6b6aaccb908e0ee2a6023..880b531030bc75883a76a3a160f8966d50230ffc 100644 --- a/Superbuild/CMake/External_geotiff.cmake +++ b/Superbuild/CMake/External_geotiff.cmake @@ -97,6 +97,12 @@ else() endif() + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + if(WIN32) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/geotiff_i.lib) + elseif(UNIX) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libgeotiff${CMAKE_SHARED_LIBRARY_SUFFIX}) + endif() endif() endif() diff --git a/Superbuild/CMake/External_itk.cmake b/Superbuild/CMake/External_itk.cmake index 62e0a7fd5684e1b9620a8238f42dafa1eded8332..6fe971c8ea287972c0da8420639bcec282386a19 100644 --- a/Superbuild/CMake/External_itk.cmake +++ b/Superbuild/CMake/External_itk.cmake @@ -170,7 +170,7 @@ else() # "configure_file(${CMAKE_SOURCE_DIR}/patches_ITK/hashtable.hxx.in # ${ITK_SB_SRC}/Modules/ThirdParty/KWSys/src/KWSys/hashtable.hxx.in COPYONLY)") - set(ITK_DIR ${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.6) + set(_SB_ITK_DIR ${SB_INSTALL_PREFIX}/lib/cmake/ITK-4.6) endif() endif() diff --git a/Superbuild/CMake/External_jpeg.cmake b/Superbuild/CMake/External_jpeg.cmake index 045c634226ada31cd0e4a63ab9221a77064db458..11223239a5b3ef28d234656cbdbf66e45a02a746 100644 --- a/Superbuild/CMake/External_jpeg.cmake +++ b/Superbuild/CMake/External_jpeg.cmake @@ -63,11 +63,11 @@ else() endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libjpeg.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libjpeg.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libjpeg${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libjpeg${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_libkml.cmake b/Superbuild/CMake/External_libkml.cmake index f28cc8c3e04e5a8a52d895b98496d69f9b38626e..789613ff1f41e2a8c42311d86620b11fa57d108a 100644 --- a/Superbuild/CMake/External_libkml.cmake +++ b/Superbuild/CMake/External_libkml.cmake @@ -41,23 +41,23 @@ else() CMAKE_COMMAND ${SB_CMAKE_COMMAND} ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlbase.lib) - set(${proj}_CONVENIENCE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlconvenience.lib) - set(${proj}_DOM_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmldom.lib) - set(${proj}_ENGINE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlengine.lib) - set(${proj}_REGIONATOR_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlregionator.lib) - set(${proj}_XSD_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlxsd.lib) - set(${proj}_MINIZIP_LIBRARY ${SB_INSTALL_PREFIX}/lib/minizip.lib) + set(_SB_${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlbase.lib) + set(_SB_${proj}_CONVENIENCE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlconvenience.lib) + set(_SB_${proj}_DOM_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmldom.lib) + set(_SB_${proj}_ENGINE_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlengine.lib) + set(_SB_${proj}_REGIONATOR_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlregionator.lib) + set(_SB_${proj}_XSD_LIBRARY ${SB_INSTALL_PREFIX}/lib/kmlxsd.lib) + set(_SB_${proj}_MINIZIP_LIBRARY ${SB_INSTALL_PREFIX}/lib/minizip.lib) elseif(UNIX) - set(${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlbase${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(${proj}_CONVENIENCE_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlconvenience${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(${proj}_DOM_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmldom${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(${proj}_ENGINE_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlengine${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(${proj}_REGIONATOR_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlregionator${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(${proj}_XSD_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlxsd${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(${proj}_MINIZIP_LIBRARY ${SB_INSTALL_PREFIX}/lib/libminizip${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_BASE_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlbase${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_CONVENIENCE_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlconvenience${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_DOM_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmldom${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_ENGINE_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlengine${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_REGIONATOR_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlregionator${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_XSD_LIBRARY ${SB_INSTALL_PREFIX}/lib/libkmlxsd${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_MINIZIP_LIBRARY ${SB_INSTALL_PREFIX}/lib/libminizip${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_muparser.cmake b/Superbuild/CMake/External_muparser.cmake index ad0fff479d5da72751ac6f501b64ff68b9b089b4..be96ca508574d96b7c9576eafb5f8184e27df6ca 100644 --- a/Superbuild/CMake/External_muparser.cmake +++ b/Superbuild/CMake/External_muparser.cmake @@ -29,11 +29,11 @@ else() ${MUPARSER_SB_SRC} ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/muparser.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/muparser.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libmuparser${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libmuparser${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_muparserx.cmake b/Superbuild/CMake/External_muparserx.cmake index fac187ce4b0296fdd088c5a8fe01322f18b02d13..97a09c0aa4f8b043ea122c339ba6576c69bfd5b0 100644 --- a/Superbuild/CMake/External_muparserx.cmake +++ b/Superbuild/CMake/External_muparserx.cmake @@ -40,11 +40,11 @@ else() ${MUPARSERX_SB_SRC} ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/muparserx.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/muparserx.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libmuparserx${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libmuparserx${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_opencv.cmake b/Superbuild/CMake/External_opencv.cmake index 623bc834b8edb4a8ade225050462f8ab21d09229..e144d9ce2e0ddd659f040b04ae553ae32ca672fe 100644 --- a/Superbuild/CMake/External_opencv.cmake +++ b/Superbuild/CMake/External_opencv.cmake @@ -72,6 +72,6 @@ else() DEPENDS ${${proj}_DEPENDENCIES} ) - set(OpenCV_DIR ${SB_INSTALL_PREFIX}/share/OpenCV) + set(_SB_OpenCV_DIR ${SB_INSTALL_PREFIX}/share/OpenCV) endif() endif() diff --git a/Superbuild/CMake/External_openjpeg.cmake b/Superbuild/CMake/External_openjpeg.cmake index 15deda83803cfddd3e1c547b0a37efe45ae1d5e8..69ebc569dceebc8211c8d6c2767372fd059249b2 100644 --- a/Superbuild/CMake/External_openjpeg.cmake +++ b/Superbuild/CMake/External_openjpeg.cmake @@ -53,11 +53,11 @@ else() CMAKE_COMMAND ${SB_CMAKE_COMMAND} ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/openjp2.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/openjp2.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libopenjp2${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libopenjp2${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_openthreads.cmake b/Superbuild/CMake/External_openthreads.cmake index 71db8cd228e5226a7ebf7bc1a2e15fd710228352..1ea90bea4d5dbce7eafa84956d883eaa1cfb8472 100644 --- a/Superbuild/CMake/External_openthreads.cmake +++ b/Superbuild/CMake/External_openthreads.cmake @@ -54,11 +54,11 @@ else() ) endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/OpenThreads.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/OpenThreads.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libOpenThreads${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libOpenThreads${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_ossim.cmake b/Superbuild/CMake/External_ossim.cmake index 8b0b252994652330b25335af7c5560ebb455710a..6536cc1cce257746abd8dac37bd7f2e0f52ab528 100644 --- a/Superbuild/CMake/External_ossim.cmake +++ b/Superbuild/CMake/External_ossim.cmake @@ -81,11 +81,11 @@ else() DEPENDERS configure ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/ossim.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/ossim.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libossim${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libossim${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_png.cmake b/Superbuild/CMake/External_png.cmake index b3b41bd37b406b357fd10b61f01706bc150dc2ae..a9bfa513970f9e5a1e4fa74eba3cbd47f88bb82e 100644 --- a/Superbuild/CMake/External_png.cmake +++ b/Superbuild/CMake/External_png.cmake @@ -69,11 +69,11 @@ else() ) endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libpng.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libpng.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_proj.cmake b/Superbuild/CMake/External_proj.cmake index 78e1cf4317f8fd9cadc6e7a2400e8442d46458c6..766753bd36e10e189075fdcb4b0facfbc1f399dd 100644 --- a/Superbuild/CMake/External_proj.cmake +++ b/Superbuild/CMake/External_proj.cmake @@ -74,11 +74,11 @@ else() ) endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/proj_i.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/proj_i.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libproj${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libproj${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_sqlite.cmake b/Superbuild/CMake/External_sqlite.cmake index 357ed98387dbe382bad2f246c0f9e215602a7683..ad46518a9ab75aa5f3091693cb80b41421d43e2a 100644 --- a/Superbuild/CMake/External_sqlite.cmake +++ b/Superbuild/CMake/External_sqlite.cmake @@ -54,11 +54,11 @@ else() endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/sqlite3.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/sqlite3.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libsqlite3${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libsqlite3${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_swig.cmake b/Superbuild/CMake/External_swig.cmake index 5f5104637148178741dbdf9a6e6d620772fb8470..3643b6d59fe80e2cfea27f49883ff0cb98910aec 100644 --- a/Superbuild/CMake/External_swig.cmake +++ b/Superbuild/CMake/External_swig.cmake @@ -80,9 +80,9 @@ else() endif() if(WIN32) - set(SWIG_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/swig.exe) + set(_SB_SWIG_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/swig.exe) elseif(UNIX) - set(SWIG_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/swig) + set(_SB_SWIG_EXECUTABLE ${SB_INSTALL_PREFIX}/bin/swig) endif() endif() diff --git a/Superbuild/CMake/External_tiff.cmake b/Superbuild/CMake/External_tiff.cmake index f54384fa1b01d1614f95a3b4c0794eaa22cb8b94..39b07f4e58e18d89f7492ba66f6b5aded6270844 100644 --- a/Superbuild/CMake/External_tiff.cmake +++ b/Superbuild/CMake/External_tiff.cmake @@ -92,11 +92,11 @@ else() endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libtiff_i.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libtiff_i.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libtiff${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libtiff${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_tinyxml.cmake b/Superbuild/CMake/External_tinyxml.cmake index d39fc92a925de32956bd6dfd41b18cb81261af74..c9ec186205322d6e0aaced69d03c2fba08835a29 100644 --- a/Superbuild/CMake/External_tinyxml.cmake +++ b/Superbuild/CMake/External_tinyxml.cmake @@ -29,11 +29,11 @@ else() ${TINYXML_SB_SRC} ) - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/tinyXML.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/tinyXML.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libtinyxml${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libtinyxml${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/External_zlib.cmake b/Superbuild/CMake/External_zlib.cmake index dca205566333bae9b51e4be2ce0c310213860f6c..baf114b94f073f1c1919c13c970b517d71c547db 100644 --- a/Superbuild/CMake/External_zlib.cmake +++ b/Superbuild/CMake/External_zlib.cmake @@ -42,11 +42,11 @@ else() ) endif() - set(${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) + set(_SB_${proj}_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) if(WIN32) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/zdll.lib) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/zdll.lib) elseif(UNIX) - set(${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libz${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(_SB_${proj}_LIBRARY ${SB_INSTALL_PREFIX}/lib/libz${CMAKE_SHARED_LIBRARY_SUFFIX}) endif() endif() diff --git a/Superbuild/CMake/SuperBuild_Macro.cmake b/Superbuild/CMake/SuperBuild_Macro.cmake index 0234d193a3dbc7396eb00ba7e409352766dc223c..13a5280d70fc36c6ec17e445b090ccbf1a3d79a1 100644 --- a/Superbuild/CMake/SuperBuild_Macro.cmake +++ b/Superbuild/CMake/SuperBuild_Macro.cmake @@ -75,7 +75,11 @@ endmacro(INCLUDE_SUPERBUILD_DEPENDENCIES) # Macro to add a cmake variable to ${proj}_SB_CONFIG (var type: string) macro(ADD_SUPERBUILD_CMAKE_VAR var) - if(DEFINED ${var}) + if(DEFINED _SB_${var}) + list(APPEND ${proj}_SB_CONFIG + -D${var}:STRING=${_SB_${var}} + ) + elseif(DEFINED ${var}) list(APPEND ${proj}_SB_CONFIG -D${var}:STRING=${${var}} ) @@ -84,7 +88,11 @@ endmacro(ADD_SUPERBUILD_CMAKE_VAR) # Macro to add a configure variable to ${proj}_SB_CONFIG macro(ADD_SUPERBUILD_CONFIGURE_VAR var name) - if(DEFINED ${var}) + if(DEFINED _SB_${var}) + list(APPEND ${proj}_SB_CONFIG + ${name}=${_SB_${var}} + ) + elseif(DEFINED ${var}) list(APPEND ${proj}_SB_CONFIG ${name}=${${var}} )