From 2c6aba33982fcbfe1c9180f615f304cbcf52369c Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Wed, 29 Jul 2009 14:32:43 +0000 Subject: [PATCH] install and doxygen doc --- install/CMakeLists.txt | 12 ++++++++---- src/doxygen/CMakeLists.txt | 2 +- src2/doxygen/CMakeLists.txt | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index 7b430a5..26abf2b 100644 --- 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 6d19d78..3d7c06b 100644 --- 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 270e121..0e1db6d 100644 --- 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}" -- 2.45.0