install and doxygen doc

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 7b430a53e38a62a967de6a85527f3dd56c156a42..26abf2bc9a564ae2bd65e22d5b0117e3615d9ef7 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -18,11 +18,15 @@ SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
+IF(WIN32)
+       SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ELSE(WIN32)
+       SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ENDIF(WIN32)
 
-  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaImageIO-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-  IF(WIN32)
-    SET(CMAKE_INSTALL_PREFIX ${CPACK_PACKAGE_INSTALL_DIRECTORY})
-  ENDIF(WIN32)
+IF(WIN32)
+       SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaImageIO)
+ENDIF(WIN32)
 
 
 IF(WIN32 AND NOT UNIX)

diff --git a/src/doxygen/CMakeLists.txt b/src/doxygen/CMakeLists.txt
index 6d19d78b40fc5f14722b6c817eed3b7f81f47e54..3d7c06b44997a0d6cd7be2c1faa026b6576cd1de 100644 (file)
--- a/src/doxygen/CMakeLists.txt
+++ b/src/doxygen/CMakeLists.txt
@@ -90,7 +90,7 @@ SET(INPUT
   )
 
 CREA_BUILD_DOXYGEN_DOC(
-  "CreaImageIO" 
+  ${CMAKE_PROJECT_NAME}_lib
   "${INPUT}" 
   "doxygen" 
   "${DOXYGEN_DOC_PREDEFINED}"

diff --git a/src2/doxygen/CMakeLists.txt b/src2/doxygen/CMakeLists.txt
index 270e1219b1ac186bf40607d9e2ec49fb7fa6166c..0e1db6d87603b5b7032fe2a07ab5c576bafb3ac4 100644 (file)
--- a/src2/doxygen/CMakeLists.txt
+++ b/src2/doxygen/CMakeLists.txt
@@ -113,7 +113,7 @@ SET(INPUT
 SET(DOXYGEN_DOC_PREDEFINED USE_WXWIDGETS)
 
 CREA_BUILD_DOXYGEN_DOC(
-  "CreaImageIO" 
+  ${CMAKE_PROJECT_NAME}_lib 
   "${INPUT}" 
   "doxygen" 
   "${CREA_DEFINITIONS}"