Installer with CPACK

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 675bd1e6845d3f3847eb1d858f8cfecb7b9f3d55..bcf35b4bef73aabbf2d45a13aeb0f3de703ce224 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,3 +16,34 @@ SUBDIRS(kernel)
 # The "core" packages 
 SUBDIRS(packages)
 #-----------------------------------------------------------------------------
+
+
+
+
+
+INCLUDE(InstallRequiredSystemLibraries)
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Black Box Tool Kit (bbtk) - Creatis-LRMN")
+SET(CPACK_PACKAGE_VENDOR "Creatis-LRMN")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
+SET(CPACK_PACKAGE_VERSION_MAJOR ${BBTK_MAJOR_VERSION})
+SET(CPACK_PACKAGE_VERSION_MINOR ${BBTK_MINOR_VERSION})
+SET(CPACK_PACKAGE_VERSION_PATCH ${BBTK_BUILD_VERSION})
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "bbtk-${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}")
+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.
+#EED  SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp")
+  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe")
+  SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} My Famous Project BBTK")
+  SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/software/bbtk")
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr")
+  SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr")
+  SET(CPACK_NSIS_MODIFY_PATH ON)
+ELSE(WIN32 AND NOT UNIX)
+  SET(CPACK_STRIP_FILES "bin/bbi")
+  SET(CPACK_SOURCE_STRIP_FILES "")
+ENDIF(WIN32 AND NOT UNIX)
+SET(CPACK_PACKAGE_EXECUTABLES "bbi" "bbs interpreter")
+INCLUDE(CPack)

diff --git a/kernel/doc/CMakeLists.txt b/kernel/doc/CMakeLists.txt
index b31f7d37f8772c4cf03291c5fe5332c5bad81855..4bc09114f902672a5931cd08d52878ddb8bc44ce 100755 (executable)
--- a/kernel/doc/CMakeLists.txt
+++ b/kernel/doc/CMakeLists.txt
@@ -114,12 +114,16 @@ IF(BUILD_bbtk_DOC)
   SUBDIRS(bbtkWebSite)
 
   
+  INSTALL(
+    DIRECTORY  ${BBTK_BINARY_DIR}/doc 
+    DESTINATION  /
+    )
 
+  INSTALL(
+    DIRECTORY  ${BBTK_BINARY_DIR}/bbs 
+    DESTINATION  /
+    )
 
-#  INSTALL(
-#    DIRECTORY  ${BBTK_BINARY_DIR}/kernel/doc 
-#    DESTINATION  ${CMAKE_INSTALL_PREFIX}
-#    )
 ENDIF(BUILD_bbtk_DOC)
 #-----------------------------------------------------------------------------
 

diff --git a/kernel/doc/bbtkWebSite/menu.html b/kernel/doc/bbtkWebSite/menu.html
index 5a06bcbc4895f91db7341c768b1a95e42cfca91e..8391c790f0b609bc17b2fc6f903580f11cb7e9cd 100644 (file)
--- a/kernel/doc/bbtkWebSite/menu.html
+++ b/kernel/doc/bbtkWebSite/menu.html
@@ -38,7 +38,7 @@ Guide</a> (<font size="2"><small><small><a
  target="information">pdf</a></small></small></font>)<br>
 Reference (pdf)<br>
 </small></font></small><small><font size="3"><small> <a
- href="../doxygen/bbtk/index.html" target="information">Doxygen doc</a></small></font></small>
+ href="../doxygen/bbtk/main.html" target="information">Doxygen doc</a></small></font></small>
 <ul>
 </ul>
 <hr style="width: 100%; height: 2px;">Boxes<small><br>

diff --git a/kernel/src/CMakeLists.txt b/kernel/src/CMakeLists.txt
index a60ee135c2be53cecb2c83e82ff60f0ed32c5f48..32b8cb26e0396554c8f0441354e2f1d8ee43041b 100644 (file)
--- a/kernel/src/CMakeLists.txt
+++ b/kernel/src/CMakeLists.txt
@@ -189,7 +189,7 @@ TARGET_LINK_LIBRARIES(bbtk ${BBTK_LINK_LIBRARIES})
 #-----------------------------------------------------------------------------
 FILE(GLOB BBTK_HEADERS "*.h")
 INSTALL(FILES ${BBTK_HEADERS} DESTINATION include/bbtk)
-INSTALL(TARGETS bbtk DESTINATION lib)
+INSTALL(TARGETS bbtk DESTINATION bin)
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------