X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_AddLibrary.cmake;h=679b0134e68e4a66e4402427d20b0ab97864a1fa;hb=dfde248b7e6bb2c1706a6b1229a17ee2aa19ed9c;hp=ef2fc17777d769c6607253385762101db402c0b2;hpb=7aa78d35c5483f9478079726dc0506990716e9c7;p=crea.git

diff --git a/cmake/CREAMacro_AddLibrary.cmake b/cmake/CREAMacro_AddLibrary.cmake
index ef2fc17..679b013 100644
--- a/cmake/CREAMacro_AddLibrary.cmake
+++ b/cmake/CREAMacro_AddLibrary.cmake
@@ -1,5 +1,31 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */ 
+
+
 # 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 +34,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,11 +60,21 @@ 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 bin)
+ELSE(WIN32)
+  INSTALL(
+    TARGETS ${LIBRARY_NAME}
+    DESTINATION ${CMAKE_CREA_LIB_PATH} )
+ENDIF(WIN32)
 
+#EED 01/July/2011
+IF (UNIX)
+  add_definitions(-fPIC)
+ENDIF(UNIX)
 
-ENDMACRO(CREA_ADD_LIBRARY)
 
+ENDMACRO(CREA_ADD_LIBRARY)