X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=cmake%2FCREAMacro_AddLibrary.cmake;h=7ae0240689dfb342cffdbcf28ac5e6ea4ad6925e;hb=cbb2fccec2094689f5d99bc9b693a9c7ce4f452c;hp=3597ad59224ea24d2ef5f0b9eaeef2542efec334;hpb=0e6fcae5b79fbc6c876d8774015c548128c856a2;p=crea.git

diff --git a/cmake/CREAMacro_AddLibrary.cmake b/cmake/CREAMacro_AddLibrary.cmake
index 3597ad5..7ae0240 100644
--- a/cmake/CREAMacro_AddLibrary.cmake
+++ b/cmake/CREAMacro_AddLibrary.cmake
@@ -1,5 +1,5 @@
 # Creates and installs a library
-# Uses CREA_MANAGE_SHARED_LIBRARY and CREA_INSTALL_LIBRARY
+# Uses CREA_DYNAMIC_LIBRARY_EXPORT and CREA_INSTALL_LIBRARY
 # hence the variables to be set for these are needed 
 # Additionnaly one needs to set :
 # ${LIBRARY_NAME}_HEADERS : the list of headers to install
@@ -8,15 +8,17 @@
 MACRO(CREA_ADD_LIBRARY LIBRARY_NAME)
 
   IF(CREA_VERBOSE_CMAKE)
-    MESSAGE(STATUS "** Creating library ${LIBRARY_NAME}")
+    MESSAGE(STATUS "===============================================")
+    MESSAGE(STATUS "Configuring library ${LIBRARY_NAME}")
     MESSAGE(STATUS "   Headers  : ${${LIBRARY_NAME}_HEADERS}")
     MESSAGE(STATUS "   Sources  : ${${LIBRARY_NAME}_SOURCES}")
     MESSAGE(STATUS "   Link libs: ${${LIBRARY_NAME}_LINK_LIBRARIES}")
+    MESSAGE(STATUS "===============================================")
   ENDIF(CREA_VERBOSE_CMAKE)
 
 
   # MANAGE SHARED LIB
-  CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
+  CREA_DYNAMIC_LIBRARY_EXPORT_OPTION(${LIBRARY_NAME})
 
   # CREATE THE TARGET
   ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES})
@@ -32,10 +34,16 @@ MACRO(CREA_ADD_LIBRARY LIBRARY_NAME)
     FILES ${${LIBRARY_NAME}_HEADERS}
     DESTINATION ${${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS}
     )  
+
+IF(WIN32)	
   INSTALL(
     TARGETS ${LIBRARY_NAME}
-    DESTINATION lib)
-
+    DESTINATION bin)
+ELSE(WIN32)
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION ${CMAKE_CREA_LIB_PATH} )
+ENDIF(WIN32)
 
 ENDMACRO(CREA_ADD_LIBRARY)