From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Thu, 26 Aug 2010 09:41:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~4
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a8e18735f0213e0e141d7679cfcc6544d37b296d;p=creaBruker.git

*** empty log message ***
---

diff --git a/cmake/UserSetDeducedPaths.cmake b/cmake/UserSetDeducedPaths.cmake
index cf993cb..922742a 100644
--- a/cmake/UserSetDeducedPaths.cmake
+++ b/cmake/UserSetDeducedPaths.cmake
@@ -43,10 +43,18 @@ CREA_MKDIR(${${PROJECT_NAME}_BBS_BUILD_PATH})
 CREA_MKDIR(${${PROJECT_NAME}_DATA_BUILD_PATH})
 
 #-----------------------------------------------------------------------------
-SET (EXECUTABLE_OUTPUT_PATH 
-  ${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH})
-SET (LIBRARY_OUTPUT_PATH    
-  ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH})
+IF ( NOT ${EXECUTABLE_OUTPUT_REL_PATH} )
+	SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH})
+  ELSE ( NOT ${EXECUTABLE_OUTPUT_REL_PATH} )
+	SET (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+ENDIF ( NOT ${EXECUTABLE_OUTPUT_REL_PATH}  )
+
+IF ( NOT ${LIBRARY_OUTPUT_REL_PATH}  )
+	SET (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH})
+  ELSE ( NOT ${LIBRARY_OUTPUT_REL_PATH}  )
+	SET (LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+ENDIF ( NOT ${LIBRARY_OUTPUT_REL_PATH}  )
+
 #-----------------------------------------------------------------------------
 MESSAGE(STATUS "* EXECUTABLE_OUTPUT_PATH=${EXECUTABLE_OUTPUT_PATH}")
 MESSAGE(STATUS "* LIBRARY_OUTPUT_PATH   =${LIBRARY_OUTPUT_PATH}")
diff --git a/lib/src1/CMakeLists.txt b/lib/src1/CMakeLists.txt
index 85dbafd..c5149f6 100644
--- a/lib/src1/CMakeLists.txt
+++ b/lib/src1/CMakeLists.txt
@@ -76,30 +76,32 @@ ENDIF(BUILD_DOXYGEN_DOC)
 
 
 
-  IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
-    SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
-  ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
-    FILE(RELATIVE_PATH 
-      CILFC_EXECUTABLE_OUTPUT_REL_PATH
-      ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
-  ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
-
- IF(UNIX)
-    SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
-  ELSE(UNIX)
-    SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
-    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
-  ENDIF(UNIX)
-  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) 
-  
-#EED ????  set(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+##  IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+##    SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+##  ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+##    FILE(RELATIVE_PATH 
+##      CILFC_EXECUTABLE_OUTPUT_REL_PATH
+##      ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+##  ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+##
+## IF(UNIX)
+##    SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+##      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
+##    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+##  ELSE(UNIX)
+##    SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+##      ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
+##    SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
+##  ENDIF(UNIX)
+##  SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME}) 
+##  
+##  #EED ????  set(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
 
   #----------------------------------------------------------------------------
   # MACRO WHICH DOES ALL THE JOB : BUILD AND INSTALL
   CREA_ADD_LIBRARY( ${LIBRARY_NAME} )
+  # Invoke the advanced macro
+##EED  CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
   #----------------------------------------------------------------------------