X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=e2133a2d7270ce797ecc8b07c713d39a413db420;hb=b5137f0744f50f51113528ad7785d6a3c1543131;hp=0ce98436f85e1ba4b5f073eec66e71e24aac7838;hpb=632ee3795c38faf6ffa11ac0d0248851eb1aa12c;p=crea.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ce9843..e2133a2 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})
@@ -18,7 +24,6 @@ INCLUDE(${CREA_CMAKE_DIR}/CREAMacros.cmake)
 
 
 CREA_PREVENT_IN_SOURCE_BUILD()
-
 SET(USE_BOOST ON)
 
 OPTION(CREA_BUILD_VTK "Build crea with vtk ?" OFF)
@@ -33,32 +38,23 @@ IF(CREA_BUILD_WX)
   SET(CREA_BUILT_WITH_WX ON)
 ENDIF(CREA_BUILD_WX)
 
-CREA_FIND_AND_USE_LIBRARIES()
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
 
+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)
-	if( NOT APPLE )
-		# check 64 bit
-		if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-			set( HAVE_64_BIT 0 )
-			SET(CREA_LIB_PATH lib)
-		else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
-			set( HAVE_64_BIT 1 )
-			SET(CREA_LIB_PATH lib64)
-		endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
-	 endif( NOT APPLE )
-ENDIF(WIN32)
-
-
+SET(CREA_LIB_PATH ${CMAKE_CREA_LIB_PATH} )
 
 MARK_AS_ADVANCED(
   CMAKE_BACKWARDS_COMPATIBILITY
   EXECUTABLE_OUTPUT_PATH 
   LIBRARY_OUTPUT_PATH
   )
+  
+SET (BOOST_FILESYSTEM_VERSION 2)
+
 #-----------------------------------------------------------------------------
 # messages compilation options 
 
@@ -76,7 +72,6 @@ INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src)
 ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(appli)
-
 #-----------------------------------------------------------------------------
 OPTION( BUILD_SAMPLES "Build samples ?" OFF)
 IF(BUILD_SAMPLES)