*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0483454b7e2849da0e21fec201096fa4d17d6002..301162e047e5aba091ddf30e4ad70379cdb3af24 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,51 +45,5 @@ IF(BUILD_SAMPLES)
 ENDIF(BUILD_SAMPLES)
 #-----------------------------------------------------------------------------
 
+SUBDIRS(install)
 
-#-----------------------------------------------------------------------------
-# Code installing the files needed to find the library
-# with the cmake command FIND_PACKAGE
-# Uses CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE macro
-#-----------------------------------------------------------------------------
-
-#-----------------------------------------------------------------------------
-# - Set the variable LIBRARY_NAME to the name of your library
-SET(LIBRARY_NAME crea)
-
-SET(${LIBRARY_NAME}_INSTALL_FOLDER crea)
-SET(${LIBRARY_NAME}_LIBRARIES crea)
-
-SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS src)
-
-IF(UNIX)
-  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH})
-ELSE(UNIX)
-  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
-ENDIF(UNIX)
-
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/crea)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
-
-# OPTIONAL 
-# - Set the version of your library
-# SET YOUR LIB VERSION
-#SET(${LIBRARY_NAME}_MAJOR_VERSION 1)
-#SET(${LIBRARY_NAME}_MINOR_VERSION 0)
-#SET(${LIBRARY_NAME}_BUILD_VERSION 0)
-# REQUIRED BUILD FLAGS
-#SET(${LIBRARY_NAME}_REQUIRED_C_FLAGS "")
-#SET(${LIBRARY_NAME}_REQUIRED_CXX_FLAGS "")
-#SET(${LIBRARY_NAME}_REQUIRED_LINK_FLAGS "")
-# ADDITIONAL CONFIG FILE
-SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE TRUE)
-SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE 
-  ${PROJECT_SOURCE_DIR}/AdditionalcreaConfig.cmake.in)
-SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE 
-  ${PROJECT_SOURCE_DIR}/AdditionalUsecrea.cmake.in)
-
-# Invoke the macro
-CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
-#-----------------------------------------------------------------------------

diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644 (file)
index 0000000..97998fd
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1 @@
+crea
\ No newline at end of file

diff --git a/README.txt b/README.txt
new file mode 100644 (file)
index 0000000..97998fd
--- /dev/null
+++ b/README.txt
@@ -0,0 +1 @@
+crea
\ No newline at end of file

diff --git a/TODO.txt b/TODO.txt
new file mode 100644 (file)
index 0000000..2497142
--- /dev/null
+++ b/TODO.txt
@@ -0,0 +1 @@
+-> CMake FATAL_ERROR when boost not found
\ No newline at end of file

diff --git a/appli/creaSed/CMakeLists.txt b/appli/creaSed/CMakeLists.txt
index d6a3d6dddda456c0f2fba20412bde0521f039e2e..ebe2b7d487bba60cd3e477758e94182869dd943f 100644 (file)
--- a/appli/creaSed/CMakeLists.txt
+++ b/appli/creaSed/CMakeLists.txt
@@ -1,2 +1,2 @@
-ADD_EXECUTABLE(creaSed creaSed)
-INSTALL(PROGRAMS creaSed DESTINATION bin)
+SET(creaSed_SOURCES creaSed)
+CREA_ADD_EXECUTABLE(creaSed)

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f38a4b6
--- /dev/null
+++ b/install/CMakeLists.txt
@@ -0,0 +1,139 @@
+IF(WIN32)
+       SET(CMAKE_INSTALL_PREFIX C:/CreaTools/crea)
+ENDIF(WIN32)
+
+
+
+#-----------------------------------------------------------------------------
+# Code installing the files needed to find the library
+# with the cmake command FIND_PACKAGE
+# Uses CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE macro
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# - Set the variable LIBRARY_NAME to the name of your library
+SET(LIBRARY_NAME crea)
+
+SET(${LIBRARY_NAME}_INSTALL_FOLDER crea)
+SET(${LIBRARY_NAME}_LIBRARIES crea)
+
+SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS src)
+
+IF(UNIX)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+    ${EXECUTABLE_OUTPUT_REL_PATH})
+ELSE(UNIX)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
+    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
+    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+ENDIF(UNIX)
+
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/crea)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+
+# OPTIONAL 
+# - Set the version of your library
+# SET YOUR LIB VERSION
+#SET(${LIBRARY_NAME}_MAJOR_VERSION 1)
+#SET(${LIBRARY_NAME}_MINOR_VERSION 0)
+#SET(${LIBRARY_NAME}_BUILD_VERSION 0)
+# REQUIRED BUILD FLAGS
+#SET(${LIBRARY_NAME}_REQUIRED_C_FLAGS "")
+#SET(${LIBRARY_NAME}_REQUIRED_CXX_FLAGS "")
+#SET(${LIBRARY_NAME}_REQUIRED_LINK_FLAGS "")
+# ADDITIONAL CONFIG FILE
+SET(${LIBRARY_NAME}_HAS_ADDITIONAL_CONFIG_FILE TRUE)
+SET(${LIBRARY_NAME}_ADDITIONAL_CONFIG_FILE 
+  ${PROJECT_SOURCE_DIR}/AdditionalcreaConfig.cmake.in)
+SET(${LIBRARY_NAME}_ADDITIONAL_USE_FILE 
+  ${PROJECT_SOURCE_DIR}/AdditionalUsecrea.cmake.in)
+
+# Invoke the macro
+CREA_ADVANCED_INSTALL_LIBRARY_FOR_CMAKE(${LIBRARY_NAME})
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# CPACK+NSIS PACKAGING
+#-----------------------------------------------------------------------------
+
+#---Documentation-------------
+#http://www.cmake.org/Wiki/CMake:Packaging_With_CPack
+#http://www.cmake.org/Wiki/CMake:CPackConfiguration
+#http://www.cmake.org/Wiki/CMake:Install_Commands
+
+
+INCLUDE(InstallRequiredSystemLibraries)
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "crea - CREATIS-LRMN")
+SET(CPACK_PACKAGE_VENDOR "CREATIS-LRMN")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt")
+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 "crea-${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_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 "crea")
+  SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/crea")
+  SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/crea")
+  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 "creaNewProject" "New project")
+  
+
+INCLUDE(CPack)
+
+
+# Aditional INSTALL for CPACK mecanism.
+
+IF(EXWIN32)
+
+OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)
+
+IF(BBTK_STANDALONE_INSTALLER)
+  STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
+  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll                             DESTINATION bin/ )
+  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll                             DESTINATION bin/ )
+
+  IF(USE_VTK)
+    SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
+
+    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
+    FOREACH( iLST  ${LST_FILE_VTKDLL} )
+       INSTALL( 
+         FILES ${iLST}
+         DESTINATION bin/
+       )
+    ENDFOREACH(iLST)
+  ENDIF(USE_VTK)
+    
+  IF(USE_ITK)
+    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll      DESTINATION bin/ )
+  ENDIF(USE_ITK)
+
+  IF(USE_WXWIDGETS)
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll          DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll             DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                                DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll                       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll                       DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll              DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                          DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll             DESTINATION bin/ )
+    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll                      DESTINATION bin/ )
+  ENDIF(USE_WXWIDGETS)
+ENDIF(BBTK_STANDALONE_INSTALLER)
+
+ENDIF(EXWIN32)