X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_Define.cmake;h=9ebb75b569f3569459668eb196ab43c48ec13141;hb=849573af00f0997944cdc7d4c42365091cd17d13;hp=b88e0382d25e6c822303a8cc459b50d612eddec0;hpb=1057f33d76778c17f08a9db64bb377178e54c4fa;p=crea.git

diff --git a/cmake/CREAMacro_Define.cmake b/cmake/CREAMacro_Define.cmake
index b88e038..9ebb75b 100644
--- a/cmake/CREAMacro_Define.cmake
+++ b/cmake/CREAMacro_Define.cmake
@@ -1,3 +1,28 @@
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */ 
+
 
 #-----------------------------------------------------------------------------
 # MACRO TO ADD A COMPILER DEFINITION WHICH ADDS ALSO THE DEF 
@@ -57,11 +82,21 @@ MACRO(CREA_DEFINE_OPERATING_SYSTEM )
       # check 64 bit
       if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
 	 set( HAVE_64_BIT 0 )
-	 SET(CMAKE_CREA_LIB_PATH lib)
+	 SET(CMAKE_CREA_LIB_PATH lib/creatools)
       else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
 	 set( HAVE_64_BIT 1 )
-	 SET(CMAKE_CREA_LIB_PATH lib64)
+	 SET(CMAKE_CREA_LIB_PATH lib64/creatools)
       endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+    else ( NOT APPLE )
+	 SET(CMAKE_CREA_LIB_PATH lib/creatools)
+
+      if( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+	 message("EED crea definitions  --------APPLE------------ 64 0")
+      else( ${CMAKE_SIZEOF_VOID_P}EQUAL 4 )
+	 message("EED crea definitions  --------APPLE------------ 64 1")
+      endif( ${CMAKE_SIZEOF_VOID_P} EQUAL 4 )
+
+
     endif( NOT APPLE )
   ENDIF(WIN32)