From: jean-pierre roux Date: Wed, 3 Nov 2010 16:16:27 +0000 (+0000) Subject: Forget to commit these ones X-Git-Tag: Creatools2-0-3.crea0-3-3.17Feb2011~9 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=71ff7141cd36d08235432c186d09d8cbcea3eafc;p=crea.git Forget to commit these ones --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 90b53c5..a7e68d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4) PROJECT(crea) INCLUDE(Version.cmake) + +SET(CREA_LIBRARY_PROPERTIES ${CREA_LIBRARY_PROPERTIES} + VERSION "${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}" + SOVERSION "${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}" +) + SET(CREA_VERBOSE_CMAKE TRUE) SET(CREA_CMAKE_REL_PATH cmake) SET(CREA_CMAKE_DIR ${PROJECT_SOURCE_DIR}/${CREA_CMAKE_REL_PATH}) diff --git a/appli/creaNewProject/CMakeLists.txt b/appli/creaNewProject/CMakeLists.txt index 1c13be6..c1bc93f 100644 --- a/appli/creaNewProject/CMakeLists.txt +++ b/appli/creaNewProject/CMakeLists.txt @@ -88,8 +88,8 @@ ELSE(WIN32) # @ONLY IMMEDIATE # ) - CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject_data) - CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/creaNewProject) + CREA_MKDIR(${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject) + CREA_CPDIR(${INPUT_PROJECT_DIR} ${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject) # Install tree INSTALL( @@ -101,7 +101,7 @@ ELSE(WIN32) INSTALL( DIRECTORY ${EXECUTABLE_OUTPUT_PATH}/share/creaNewProject DESTINATION share - ) + ) ENDIF(WIN32) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b02dbc9..05bd545 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,6 +51,9 @@ TARGET_LINK_LIBRARIES(crea ${VTK_LIBRARIES} ${BOOST_LIBRARIES} ) + +SET_TARGET_PROPERTIES(crea PROPERTIES ${CREA_LIBRARY_PROPERTIES}) + # # ${GDCM_LIBRARIES} # ${SQLITE_LIBRARIES})