X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=a7e68d69a4880da72783c39f3e7354f39581cdf8;hb=71ff7141cd36d08235432c186d09d8cbcea3eafc;hp=bd4e1eaf8bde3a539bf2c4dfb60a8dbd7ab23d9e;hpb=0693a70299d762305963a91af83759ec256e5549;p=crea.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd4e1ea..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})
@@ -37,13 +43,7 @@ CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
-IF (WIN32)
-  SET(CREA_LIB_PATH bin)
-ELSE (WIN32)
-  SET(CREA_LIB_PATH lib)
-ENDIF(WIN32)
-
-
+SET(CREA_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 MARK_AS_ADVANCED(
   CMAKE_BACKWARDS_COMPATIBILITY
@@ -61,13 +61,13 @@ OPTION ( CREA_COMPILE_WARNING_MESSAGES "Compile CREA warning messages ?" ON)
 
 INCLUDE(${CREA_CMAKE_DIR}/CREAResolveOptions.cmake)
 
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
+
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(appli)
 
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src)
-INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
-
 #-----------------------------------------------------------------------------
 OPTION( BUILD_SAMPLES "Build samples ?" OFF)
 IF(BUILD_SAMPLES)