From 6f4fdb1da4a6a394e7c77d6d2d54d262f6f866be Mon Sep 17 00:00:00 2001 From: Romain Garrigues <romain.garrigues@c-s.fr> Date: Thu, 29 Jun 2006 09:43:52 +0000 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20ITK=20version=202.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ffbe801e0..f485d624d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -263,8 +263,30 @@ ENDIF(BUILD_TESTING) #----------------------------------------------------------------------------- # Output directories. -SET (LIBRARY_OUTPUT_PATH ${OTB_BINARY_DIR}/bin CACHE INTERNAL "Les librairies sont generees dans le m�e repertoire.") -SET (EXECUTABLE_OUTPUT_PATH ${OTB_BINARY_DIR}/bin CACHE INTERNAL "Les executables sont generes dans le m�e repertoire.") + + +#SET (LIBRARY_OUTPUT_PATH ${OTB_BINARY_DIR}/bin CACHE INTERNAL "Les librairies sont generees dans le m�e repertoire.") +#SET (EXECUTABLE_OUTPUT_PATH ${OTB_BINARY_DIR}/bin CACHE INTERNAL "Les executables sont generes dans le m�e repertoire.") + +#ROMAIN +IF(NOT LIBRARY_OUTPUT_PATH) + SET (LIBRARY_OUTPUT_PATH ${OTB_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all libraries.") +ENDIF(NOT LIBRARY_OUTPUT_PATH) +IF(NOT EXECUTABLE_OUTPUT_PATH) + SET (EXECUTABLE_OUTPUT_PATH ${OTB_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.") +ENDIF(NOT EXECUTABLE_OUTPUT_PATH) + +IF(NOT OTB_NO_LIBRARY_VERSION) + # This setting of SOVERSION assumes that any API change + # will increment either the minor or major version number of OTB. + SET(OTB_LIBRARY_PROPERTIES + VERSION "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}.${OTB_VERSION_PATCH}" + SOVERSION "${OTB_VERSION_MAJOR}.${OTB_VERSION_MINOR}") +ENDIF(NOT OTB_NO_LIBRARY_VERSION) + + + + MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) SET(OTB_LIBRARY_PATH "${LIBRARY_OUTPUT_PATH}") SET(OTB_EXECUTABLE_PATH "${EXECUTABLE_OUTPUT_PATH}") -- GitLab