X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=install%2FCMakeLists.txt;h=6d123b1315c8ceb8dc8f0ecc5685af0358c21ef9;hb=f7f202e6ec71c0f88d211d6a78f88ba017dee851;hp=fa78a47f8ec6150e0c59b62cdce92c78daef4bdc;hpb=ffbaf4177cae0647c558f89daf6783b91373930d;p=crea.git

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index fa78a47..6d123b1 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -1,6 +1,3 @@
-IF(WIN32)
-	SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea)
-ENDIF(WIN32)
 
 
 
@@ -21,11 +18,12 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS src)
 
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH})
+    .) # ${EXECUTABLE_OUTPUT_REL_PATH})
 ELSE(UNIX)
-  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
+     .    )
+#    Debug
+#    Release)
 ENDIF(UNIX)
 
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/crea)
@@ -71,7 +69,12 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${crea_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR ${crea_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${crea_BUILD_VERSION})
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\crea-${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}")
+IF(WIN32)
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\crea-${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}")
+ELSE(WIN32)
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/crea-${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}")
+ENDIF(WIN32)
+
 IF(WIN32 AND NOT UNIX)
   # There is a bug in NSI that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
@@ -87,6 +90,7 @@ ELSE(WIN32 AND NOT UNIX)
   SET(CPACK_SOURCE_STRIP_FILES "")
 ENDIF(WIN32 AND NOT UNIX)
 SET(CPACK_PACKAGE_EXECUTABLES "creaNewProject" "New project")
+
   
 
 INCLUDE(CPack)