From 481ff241e1d1d8cf90ae92a597e8ad4dcba07136 Mon Sep 17 00:00:00 2001 From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org> Date: Tue, 26 May 2009 10:06:58 +0800 Subject: [PATCH] COMP: ossimVersion.h generation --- Utilities/otbossim/CMakeLists.txt | 35 +------------------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt index c9bd0d92dd..8b81e58d72 100644 --- a/Utilities/otbossim/CMakeLists.txt +++ b/Utilities/otbossim/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(otbossim) SET(OSSIM_MAJOR_VERSION_NUMBER "1") SET(OSSIM_MINOR_VERSION_NUMBER "7") -SET(OSSIM_PATCH_VERSION_NUMBER "15") +SET(OSSIM_PATCH_VERSION_NUMBER "16") SET(OSSIM_RELEASE_NUMBER "?") SET(OSSIM_VERSION "${OSSIM_MAJOR_VERSION_NUMBER}-${OSSIM_MINOR_VERSION_NUMBER}-${OSSIM_PATCH_VERSION_NUMBER}" ) @@ -21,39 +21,6 @@ INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Utilities/otbossim/include) CONFIGURE_FILE(${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h.in ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimConfig.h) -# Run ossim/version-config.cpp taht will generate ossim/ossimVersion.h file nedeed to compile OSSIM -# SET(INCLUDES_OSSIM_TRY_RUN "-DINCLUDE_DIRECTORIES:STRING=${OTB_BINARY_DIR}/Utilities/otbossim/include" ) -# TRY_RUN(RUN_RESULT_VAR COMPILE_RESULT_VAR -# ${OTB_BINARY_DIR} -# ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/version-config.cpp -# CMAKE_FLAGS "${INCLUDES_OSSIM_TRY_RUN}" -# OUTPUT_VARIABLE output -# ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h" -# ) -# IF(NOT COMPILE_RESULT_VAR) -# MESSAGE(FATAL_ERROR "OSSIM : cannot compile version-config.cpp") -# ENDIF(NOT COMPILE_RESULT_VAR) -# -# IF(RUN_RESULT_VAR) -# MESSAGE(FATAL_ERROR "OSSIM : cannot create ossimVersion.h file") -# ENDIF(RUN_RESULT_VAR) - -ADD_EXECUTABLE(version-config ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/version-config.cpp) - -# ADD_CUSTOM_COMMAND( -# OUTPUT ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h -# DEPENDS version-config -# COMMAND version-config -# ARGS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h" -# COMMENT "Generating ossimVersion.h" -# ) - -# SET_SOURCE_FILES_PROPERTIES( -# ${OTB_SOURCE_DIR}/Utilities/otbossim/src/ossim/init/ossimInit.cpp PROPERTIES -# OBJECT_DEPENDS "${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim/ossimVersion.h" -# ) - - SUBDIRS(include) -- GitLab