Commit 5fb65c85 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

no need of add_custom_target for system libs

parent c1440e1d
......@@ -21,7 +21,7 @@ if(USE_SYSTEM_BOOST)
1.35.0
COMPONENTS unit_test_framework
)
add_custom_target(${proj})
message(STATUS " Using Boost system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup cURL ...")
if(USE_SYSTEM_CURL)
find_package ( CURL )
add_custom_target(${proj})
message(STATUS " Using cURL system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup expat ...")
if(USE_SYSTEM_EXPAT)
find_package ( EXPAT )
add_custom_target(${proj})
message(STATUS " Using expat system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -8,7 +8,6 @@ message(STATUS "Setup FFTW ...")
if(USE_SYSTEM_FFTW)
# TODO : use ITK's FindFFTW
#find_package ( FFTW )
add_custom_target(${proj})
message(STATUS " Using FFTW system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup GDAL...")
if(USE_SYSTEM_GDAL)
find_package ( GDAL )
add_custom_target(${proj})
message(STATUS " Using GDAL system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,8 +7,7 @@ message(STATUS "Setup GEOS ...")
if(USE_SYSTEM_GEOS)
# TODO : FindGEOS.cmake
#find_package ( GEOS )
add_custom_target(${proj})
find_package ( GEOS )
message(STATUS " Using GEOS system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup libgeotiff...")
if(USE_SYSTEM_GEOTIFF)
find_package ( GeoTIFF )
add_custom_target(${proj})
message(STATUS " Using libgeotiff system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup ITK...")
if(USE_SYSTEM_ITK)
find_package ( ITK )
add_custom_target(${proj})
message(STATUS " Using ITK system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup libKML ...")
if(USE_SYSTEM_LIBKML)
find_package ( LibKML )
add_custom_target(${proj})
message(STATUS " Using libKML system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup LibSVM...")
if(USE_SYSTEM_LIBSVM)
find_package ( LibSVM )
add_custom_target(${proj})
message(STATUS " Using LibSVM system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup muParser ...")
if(USE_SYSTEM_MUPARSER)
find_package ( MuParser )
add_custom_target(${proj})
message(STATUS " Using muParser system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup muParserX ...")
if(USE_SYSTEM_MUPARSERX)
find_package ( MuParserX )
add_custom_target(${proj})
message(STATUS " Using muParserX system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup OpenCV...")
if(USE_SYSTEM_OPENCV)
find_package ( OpenCV )
add_custom_target(${proj})
message(STATUS " Using OpenCV system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,8 +7,7 @@ message(STATUS "Setup OpenJpeg...")
if(USE_SYSTEM_OPENJPEG)
# TODO : FindOpenJPEG.cmake
# find_package ( OpenJPEG )
add_custom_target(${proj})
find_package ( OpenJPEG )
message(STATUS " Using OpenJpeg system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup OpenSSL ...")
if(USE_SYSTEM_OPENSSL)
find_package ( OPENSSL )
add_custom_target(${proj})
message(STATUS " Using OpenSSL system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -11,7 +11,6 @@ endif()
if(USE_SYSTEM_OPENTHREADS)
find_package ( OpenThreads )
add_custom_target(${proj})
message(STATUS " Using OpenThread system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -13,7 +13,6 @@ message(STATUS "Setup Ossim...")
if(USE_SYSTEM_OSSIM)
find_package ( Ossim )
add_custom_target(${proj})
message(STATUS " Using OSSIM system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -30,35 +30,35 @@ endif()
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(${proj} GDAL OSSIM ITK TINYXML BOOST)
if(OTB_USE_CURL)
list(APPEND ${proj}_DEPENDENCIES CURL)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(CURL)
endif()
if(OTB_USE_LIBKML)
list(APPEND ${proj}_DEPENDENCIES LIBKML)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(LIBKML)
endif()
if(OTB_USE_OPENCV)
list(APPEND ${proj}_DEPENDENCIES OPENCV)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(OPENCV)
endif()
if(OTB_USE_LIBSVM)
list(APPEND ${proj}_DEPENDENCIES LIBSVM)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(LIBSVM)
endif()
if(OTB_USE_MUPARSER)
list(APPEND ${proj}_DEPENDENCIES MUPARSER)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(MUPARSER)
endif()
if(OTB_USE_MUPARSERX)
list(APPEND ${proj}_DEPENDENCIES MUPARSERX)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(MUPARSERX)
endif()
if(OTB_WRAP_PYTHON OR OTB_WRAP_JAVA)
list(APPEND ${proj}_DEPENDENCIES SWIG)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(SWIG)
endif()
if(OTB_USE_QT4)
list(APPEND ${proj}_DEPENDENCIES QT4)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(QT4)
endif()
INCLUDE_SUPERBUILD_DEPENDENCIES(${${proj}_DEPENDENCIES})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup libpng...")
if(USE_SYSTEM_PNG)
find_package ( PNG )
add_custom_target(${proj})
message(STATUS " Using libpng system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup Qt4 ...")
if(USE_SYSTEM_QT4)
find_package ( Qt4 )
add_custom_target(${proj})
message(STATUS " Using Qt4 system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -31,8 +31,7 @@ else()
endif()
if(MSVC)
#is JPEG required for linux also?
STRING(REGEX REPLACE "/$" "" CMAKE_WIN_INSTALL_PREFIX ${SB_INSTALL_PREFIX})
STRING(REGEX REPLACE "/" "\\\\" CMAKE_WIN_INSTALL_PREFIX ${CMAKE_WIN_INSTALL_PREFIX})
configure_file(${CMAKE_SOURCE_DIR}/patches/${proj}/nmake.opt ${CMAKE_BINARY_DIR}/nmake_libtiff_extra.opt)
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup TinyXML ...")
if(USE_SYSTEM_TINYXML)
find_package ( TinyXML )
add_custom_target(${proj})
message(STATUS " Using TinyXML system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
......@@ -7,7 +7,6 @@ message(STATUS "Setup Zlib ...")
if(USE_SYSTEM_ZLIB)
find_package(ZLIB)
add_custom_target(${proj})
message(STATUS " Using Zlib system version")
else()
SETUP_SUPERBUILD(PROJECT ${proj})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment