Commit fd37fbfd authored by Julien Michel's avatar Julien Michel
Browse files

Arrêtons de recompiler OSSIM ! New option inside

parent f2d22fd0
...@@ -278,6 +278,16 @@ ENDIF( OTB_SHOW_ALL_MSG_DEBUG ) ...@@ -278,6 +278,16 @@ ENDIF( OTB_SHOW_ALL_MSG_DEBUG )
OPTION(OTB_DISABLE_CXX_EXAMPLES_TESTING "Disable examples testing." OFF) OPTION(OTB_DISABLE_CXX_EXAMPLES_TESTING "Disable examples testing." OFF)
MARK_AS_ADVANCED(OTB_DISABLE_CXX_EXAMPLES_TESTING) MARK_AS_ADVANCED(OTB_DISABLE_CXX_EXAMPLES_TESTING)
#-----------------------------------------------------------------------------
# Advanced option to avoid recompiling utilities at each cmake reconfiguration
OPTION(OTB_DISABLE_UTILITIES_COMPILATION "Disable utilities compilation (developpers only - use at you own risk)" OFF)
MARK_AS_ADVANCED(OTB_DISABLE_UTILITIES_COMPILATION)
IF(OTB_DISABLE_UTILITIES_COMPILATION)
LINK_DIRECTORIES("${OTB_BINARY_DIR}/bin")
ENDIF(OTB_DISABLE_UTILITIES_COMPILATION)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Option to define streaming activation in applications # Option to define streaming activation in applications
# Use by otbConfigure.h.in # Use by otbConfigure.h.in
...@@ -617,5 +627,3 @@ ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.7) ...@@ -617,5 +627,3 @@ ELSE("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.7)
"Please upgrade to CMake 1.8.") "Please upgrade to CMake 1.8.")
ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.7) ENDIF("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 1.7)
#ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
SUBDIRS(Common Numerics BasicFilters Algorithms SpatialObject) SUBDIRS(Common Numerics BasicFilters Algorithms SpatialObject)
IF( ITK_USE_PATENTED ) IF( ITK_USE_PATENTED )
...@@ -11,3 +14,4 @@ ENDIF( ITK_USE_REVIEW ) ...@@ -11,3 +14,4 @@ ENDIF( ITK_USE_REVIEW )
## There should be no library dependances on IO, but IO may depend on other ## There should be no library dependances on IO, but IO may depend on other
## libraries, so build it last ## libraries, so build it last
SUBDIRS(IO) SUBDIRS(IO)
ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
...@@ -16,6 +16,9 @@ PROJECT( ${METAIO_NAMESPACE} ) ...@@ -16,6 +16,9 @@ PROJECT( ${METAIO_NAMESPACE} )
INCLUDE_DIRECTORIES(${${METAIO_NAMESPACE}_SOURCE_DIR}) INCLUDE_DIRECTORIES(${${METAIO_NAMESPACE}_SOURCE_DIR})
#ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
ADD_LIBRARY(${METAIO_NAMESPACE} ADD_LIBRARY(${METAIO_NAMESPACE}
metaTypes.h metaTypes.h
metaUtils.cxx metaUtils.cxx
...@@ -145,5 +148,5 @@ ELSE(METAIO_FOR_VTK) ...@@ -145,5 +148,5 @@ ELSE(METAIO_FOR_VTK)
ENDIF(METAIO_FOR_ITK) ENDIF(METAIO_FOR_ITK)
ENDIF(METAIO_FOR_VTK) ENDIF(METAIO_FOR_VTK)
ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
...@@ -57,10 +57,14 @@ ENDIF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$") ...@@ -57,10 +57,14 @@ ENDIF("GDCM_COMPILER_HAS_FUNCTION" MATCHES "^GDCM_COMPILER_HAS_FUNCTION$")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build directory on which many applications depend # Build directory on which many applications depend
# ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT DISABLE_OTB_UTILITIES_COMPILATION)
SUBDIRS( SUBDIRS(
Dicts Dicts
src src
) )
ENDIF(NOT DISABLE_OTB_UTILITIES_COMPILATION)
# Set the place for the public dictionary, must be set before gdcmConfigure.h # Set the place for the public dictionary, must be set before gdcmConfigure.h
SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}") SET( GDCM_PUB_DICT_PATH "${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}")
......
...@@ -140,5 +140,7 @@ MACRO(ITK_JPEG_BODY BITRATE) ...@@ -140,5 +140,7 @@ MACRO(ITK_JPEG_BODY BITRATE)
ENDIF(NOT ITK_INSTALL_NO_LIBRARIES) ENDIF(NOT ITK_INSTALL_NO_LIBRARIES)
ENDMACRO(ITK_JPEG_BODY) ENDMACRO(ITK_JPEG_BODY)
# ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT DISABLE_OTB_UTILITIES_COMPILATION)
SUBDIRS(8 12 16) SUBDIRS(8 12 16)
ENDIF(NOT DISABLE_OTB_UTILITIES_COMPILATION)
...@@ -25,6 +25,8 @@ CONFIGURE_FILE(${ITKPNG_SOURCE_DIR}/.NoDartCoverage ...@@ -25,6 +25,8 @@ CONFIGURE_FILE(${ITKPNG_SOURCE_DIR}/.NoDartCoverage
CONFIGURE_FILE(${ITKPNG_SOURCE_DIR}/pngDllConfig.h.in CONFIGURE_FILE(${ITKPNG_SOURCE_DIR}/pngDllConfig.h.in
${ITKPNG_BINARY_DIR}/pngDllConfig.h) ${ITKPNG_BINARY_DIR}/pngDllConfig.h)
#ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
ADD_LIBRARY(itkpng ${PNG_SRCS}) ADD_LIBRARY(itkpng ${PNG_SRCS})
TARGET_LINK_LIBRARIES(itkpng ${ITK_ZLIB_LIBRARIES}) TARGET_LINK_LIBRARIES(itkpng ${ITK_ZLIB_LIBRARIES})
...@@ -49,3 +51,4 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT) ...@@ -49,3 +51,4 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itkpng DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itkpng
COMPONENT Development) COMPONENT Development)
ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT) ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
...@@ -137,6 +137,10 @@ CONFIGURE_FILE(${ITKTIFF_SOURCE_DIR}/tiffDllConfig.h.in ...@@ -137,6 +137,10 @@ CONFIGURE_FILE(${ITKTIFF_SOURCE_DIR}/tiffDllConfig.h.in
CONFIGURE_FILE(${ITKTIFF_SOURCE_DIR}/tif_config.h.in CONFIGURE_FILE(${ITKTIFF_SOURCE_DIR}/tif_config.h.in
${ITKTIFF_BINARY_DIR}/tif_config.h) ${ITKTIFF_BINARY_DIR}/tif_config.h)
# ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
ADD_LIBRARY(itktiff ${common_SRCS}) ADD_LIBRARY(itktiff ${common_SRCS})
TARGET_LINK_LIBRARIES(itktiff ${ITK_ZLIB_LIBRARIES} itkjpeg8) TARGET_LINK_LIBRARIES(itktiff ${ITK_ZLIB_LIBRARIES} itkjpeg8)
...@@ -167,3 +171,4 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT) ...@@ -167,3 +171,4 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itktiff DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itktiff
COMPONENT Development) COMPONENT Development)
ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT) ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
...@@ -29,7 +29,8 @@ CONFIGURE_FILE(${ITKZLIB_SOURCE_DIR}/.NoDartCoverage ...@@ -29,7 +29,8 @@ CONFIGURE_FILE(${ITKZLIB_SOURCE_DIR}/.NoDartCoverage
CONFIGURE_FILE(${ITKZLIB_SOURCE_DIR}/zlibDllConfig.h.in CONFIGURE_FILE(${ITKZLIB_SOURCE_DIR}/zlibDllConfig.h.in
${ITKZLIB_BINARY_DIR}/zlibDllConfig.h) ${ITKZLIB_BINARY_DIR}/zlibDllConfig.h)
#ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
ADD_LIBRARY(itkzlib ${ZLIB_SRCS}) ADD_LIBRARY(itkzlib ${ZLIB_SRCS})
# Apply user-defined properties to the library target. # Apply user-defined properties to the library target.
...@@ -53,3 +54,4 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT) ...@@ -53,3 +54,4 @@ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itkzlib DESTINATION ${ITK_INSTALL_INCLUDE_DIR_CM24}/Utilities/itkzlib
COMPONENT Development) COMPONENT Development)
ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT) ENDIF(NOT ITK_INSTALL_NO_DEVELOPMENT)
ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
...@@ -733,6 +733,8 @@ FOREACH(h ${KWSYS_HXX_FILES}) ...@@ -733,6 +733,8 @@ FOREACH(h ${KWSYS_HXX_FILES})
ENDIF(KWSYS_HEADER_INSTALL_DIR) ENDIF(KWSYS_HEADER_INSTALL_DIR)
ENDFOREACH(h) ENDFOREACH(h)
#ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Add the library with the configured name and list of sources. # Add the library with the configured name and list of sources.
IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS) IF(KWSYS_C_SRCS OR KWSYS_CXX_SRCS)
...@@ -957,3 +959,5 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) ...@@ -957,3 +959,5 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY AND KWSYS_STANDALONE) ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY AND KWSYS_STANDALONE)
ENDIF(BUILD_TESTING) ENDIF(BUILD_TESTING)
ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
...@@ -18,6 +18,8 @@ SET(MODULE_PATH ${vxl_SOURCE_DIR}/config/cmake/Modules) ...@@ -18,6 +18,8 @@ SET(MODULE_PATH ${vxl_SOURCE_DIR}/config/cmake/Modules)
SUBDIRS(config/cmake/config) SUBDIRS(config/cmake/config)
# Build the core vxl + support libraries # Build the core vxl + support libraries
#ADDED BY OTB DEVELOPPERS TO AVOID INTENSIVE RECOMPILATION
IF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
SUBDIRS(vcl v3p core) SUBDIRS(vcl v3p core)
# Standard include directories. # Standard include directories.
...@@ -53,3 +55,4 @@ IF(CMAKE_COMPILER_IS_GNUCXX) ...@@ -53,3 +55,4 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
ENDIF(CMAKE_COMPILER_IS_GNUCXX) ENDIF(CMAKE_COMPILER_IS_GNUCXX)
ENDIF(NOT OTB_DISABLE_UTILITIES_COMPILATION)
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