X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FUserSetDeducedPaths.cmake;h=922742a6af4e0436b2814e57d69d8f476e6854a3;hb=98b3f017715cfc0207bda87f08afe0c565607baa;hp=cf993cbab2ff7f806e64167fa2b7481b0110346c;hpb=8f2fc8236f01d70abd3e4abe4152ea7985ab5b79;p=creaBruker.git

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}")