Commit 73dbb4b7 authored by Rashad Kanavath's avatar Rashad Kanavath

MRG

parents 575fdd0f 645ba8c1
......@@ -7,7 +7,8 @@ set(OTB_SB_BUILD_DIR ${CMAKE_BINARY_DIR}/${proj}/build)
set(${proj}_DEPENDENCIES)
set(BUILD_LIBKML ON)
set(BUILD_OPENCV ON)
set(BUILD_JPEG2000 ON)
set(BUILD_EXAMPLES ON)
if(USE_SYSTEM_GDAL)
set(OTB_SB_GDAL_CONFIG)
......@@ -122,13 +123,14 @@ if(MSVC)
set(OTB_SB_TINYXML_CONFIG)
set(OTB_SB_LIBKML_CONFIG)
set(OTB_SB_OPENCV_CONFIG)
set(OTB_SB_CURL_CONFIG)
#doesn't matter to use cmake variable with JPEG prefix. all are empty for windows
set(OTB_SB_CURL_CONFIG -DJPEG_LIBRARY:STRING=${CMAKE_INSTALL_PREFIX}/lib/libjpeg.lib)
#force libkml and opencv OFF)
set(BUILD_LIBKML OFF)
set(BUILD_OPENCV OFF)
list(REMOVE_ITEM ${proj}_DEPENDENCIES CURL)
set(BUILD_JPEG2000 OFF)
set(BUILD_EXAMPLES OFF)
list(REMOVE_ITEM ${proj}_DEPENDENCIES LIBKML)
list(REMOVE_ITEM ${proj}_DEPENDENCIES OPENCV)
endif()
ExternalProject_Add(${proj}
DEPENDS ${${proj}_DEPENDENCIES}
......@@ -142,7 +144,7 @@ ExternalProject_Add(${proj}
-DCMAKE_BUILD_TYPE:STRING=Release
-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=${BUILD_TESTING}
-DBUILD_EXAMPLES:BOOL=ON
-DBUILD_EXAMPLES:BOOL=${BUILD_EXAMPLES}
-DBUILD_APPLICATIONS:BOOL=ON
-DOTB_WRAP_QT:BOOL=OFF
-DCMAKE_PREFIX_PATH:STRING=${CMAKE_INSTALL_PREFIX}
......@@ -155,7 +157,8 @@ ExternalProject_Add(${proj}
-DOTB_USE_EXTERNAL_TINYXML:BOOL=ON
-DOTB_USE_EXTERNAL_EXPAT:BOOL=ON
-DOTB_USE_EXTERNAL_LIBKML:BOOL=${BUILD_LIBKML}
-DOTB_USE_OPENCV:BOOL=${BUILD_OPENCV}
-DOTB_USE_OPENCV:BOOL=ON
-DOTB_USE_JPEG2000:BOOL=${BUILD_JPEG2000}
${OTB_SB_ITK_CONFIG}
${OTB_SB_OSSIM_CONFIG}
${OTB_SB_GDAL_CONFIG}
......@@ -165,10 +168,8 @@ ExternalProject_Add(${proj}
${OTB_SB_BOOST_CONFIG}
${OTB_SB_LIBKML_CONFIG}
${OTB_SB_OPENCV_CONFIG}
CMAKE_COMMAND
# use 'env' because CTest launcher doesn't perform shell interpretation
env LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_COMMAND}
${OTB_SB_CURL_CONFIG}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
)
message(STATUS " Using OTB SuperBuild version")
......@@ -14,8 +14,6 @@ else()
set(OPENCV_SB_BUILD_DIR ${CMAKE_BINARY_DIR}/${proj}/build)
set(OPENCV_SB_SRC_DIR ${CMAKE_BINARY_DIR}/${proj}/src/${proj})
if(UNIX)
ExternalProject_Add(${proj}
PREFIX ${proj}
URL "http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.10/opencv-2.4.10.zip/download"
......@@ -63,10 +61,6 @@ else()
-DBUILD_opencv_world:BOOL=OFF
DEPENDS ${${proj}_DEPENDENCIES}
)
else(MSVC)
endif()
message(STATUS " Using OpenCV SuperBuild version")
endif()
......@@ -19,6 +19,7 @@ else()
if(MSVC)
# TODO : get precompiled binaries as not all MSVC versions can compile FFTW
message(STATUS " FFTW SuperBuild is not available yet...")
else()
# Compile the float version of FFTW
ExternalProject_Add(${projFloat}
......@@ -67,9 +68,10 @@ else()
# DEPENDEES patch update
# DEPENDERS configure
# )
message(STATUS " Using FFTW SuperBuild version")
endif()
message(STATUS " Using FFTW SuperBuild version")
endif()
\ No newline at end of file
......@@ -50,7 +50,7 @@ else()
#try to use github clone
#URIPARSER, GOOGLETEST, EXPAT, MINIZIP dependencies
### endif()
message(STATUS " LibKML SuperBuild is not available yet...")
else(UNIX)
......
......@@ -17,7 +17,12 @@ else()
if(NOT DEFINED git_protocol)
set(git_protocol "git")
endif()
if(MSVC)
message(STATUS " Qt4 SuperBuild is not available yet...")
else(UNIX)
ExternalProject_Add(${proj}
PREFIX ${proj}
URL "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
......@@ -43,5 +48,6 @@ else()
message(STATUS " Using Qt4 SuperBuild version")
endif()
endif()
\ No newline at end of file
......@@ -11,39 +11,39 @@ set(CMAKE_MODULE_PATH
include(ExternalProject)
include(CTest)
if(MSVC)
set(SB_CMAKE_COMMAND ${CMAKE_COMMAND})
set(SB_MAKE_CMD "nmake")
else(UNIX)
set(SB_CMAKE_COMMAND env LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_COMMAND})
set(SB_MAKE_CMD "make")
endif()
# Call external projects
#TODO: enforce check from ITK on directory length
include(External_jpeg)
include(External_SQLite)
include(External_zlib)
include(External_jpeg)
include(External_expat)
include(External_libpng)
include(External_libtiff)
include(External_proj4)
include(External_geotiff)
include(External_SQLite)
include(External_geos)
include(External_fftw)
include(External_OpenJpeg)
include(External_muParser)
include(External_muParserX)
include(External_TinyXML)
include(External_expat)
if(UNIX)
include(External_boost)
endif()
include(External_libKML)
include(External_curl)
include(External_GDAL)
# TODO: skip boost headers from gdal includes
# move sub-dependencies into proper parent dependency.
if(MSVC)
include(External_boost)
endif()
include(External_fftw)
include(External_ITK)
include(External_openthread)
include(External_OpenThreads)
include(External_ossim)
include(External_muParser)
include(External_muParserX)
include(External_TinyXML)
include(External_OpenCV)
include(External_qt4)
# TODO
......
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