]> Creatis software - crea.git/commitdiff
Forget to commit these ones
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 3 Nov 2010 16:16:27 +0000 (16:16 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Wed, 3 Nov 2010 16:16:27 +0000 (16:16 +0000)
CMakeLists.txt
appli/creaNewProject/CMakeLists.txt
src/CMakeLists.txt

index 90b53c5d6bfb1461591608c5061f02017380ea03..a7e68d69a4880da72783c39f3e7354f39581cdf8 100644 (file)
@@ -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})
index 1c13be66090a48e2aa55b5f0174c134efd11240e..c1bc93fabac829a21c4c9517cc228f594e447463 100644 (file)
@@ -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)
 
index b02dbc974aae98a2ae717576ad3ae5bd712c62ba..05bd545c85d3f3364afa708c9c6312c05e2d0521 100644 (file)
@@ -51,6 +51,9 @@ TARGET_LINK_LIBRARIES(crea
   ${VTK_LIBRARIES}
   ${BOOST_LIBRARIES}  
 )
+
+SET_TARGET_PROPERTIES(crea PROPERTIES ${CREA_LIBRARY_PROPERTIES})
+
 #
 #  ${GDCM_LIBRARIES}
 #  ${SQLITE_LIBRARIES})