Changeset da28cf0a in tol

Timestamp:

Jul 9, 2015, 9:40:34 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

e5d44d2

Parents:

2bec99e

Message:

Closes #1856, #1857, #1858
Se incorporan los .h y .lib al instalador.
Se separa el contenido en dos componentes, una obligatoria y otra opcional.
Se incluye language.txt en el instalador.
Se elimina la información .svn del instalador.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6772 be4846ae-f051-483a-831f-b64e7d08527f

File:

• CMakeLists.txt (modified) (5 diffs)

CMakeLists.txt

@@ -8 +8 @@
 endif( NOT TOL_RUNTIME_DIR )
 
+# => http://www.cmake.org/Wiki/CMake:Component_Install_With_CPack
+
 if( WIN32 )
+  # BIN (APPLICATION)
   file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.dll" dll_pattern )
   file( GLOB RT_DLL  ${dll_pattern} )
-  install( FILES ${RT_DLL} DESTINATION "bin" )
+  install( FILES ${RT_DLL} DESTINATION "bin" COMPONENT application)
   file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.exe" exe_pattern )
   file( GLOB RT_EXE  ${exe_pattern} )
-  install( FILES ${RT_EXE} DESTINATION "bin" )
+  install( FILES ${RT_EXE} DESTINATION "bin" COMPONENT application)
+  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir )
+  install( DIRECTORY ${stdlib_dir} DESTINATION "bin" COMPONENT application 
+    PATTERN ".svn" EXCLUDE )
+  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/language.txt" language_txt )
+  file( GLOB RT_TXT  ${language_txt} )
+  install( FILES ${RT_TXT} DESTINATION "bin" COMPONENT application)
+  # BIN (DEVELOPMENT)
+  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.lib" lib_pattern )
+  file( GLOB RT_LIB  ${lib_pattern} )
+  install( FILES ${RT_LIB} DESTINATION "bin" COMPONENT development)
+  # LIB (APPLICATION)
   file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/lib" lib_dir )
-  install( DIRECTORY ${lib_dir} DESTINATION "." PATTERN "*.a" EXCLUDE )
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir )
-  install( DIRECTORY ${stdlib_dir} DESTINATION "bin" )
+  install( DIRECTORY ${lib_dir} DESTINATION "." COMPONENT application
+    PATTERN "*.a" EXCLUDE PATTERN ".svn" EXCLUDE )
+  # INCLUDE (DEVELOPMENT)
+  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/include" include_dir )
+  install( DIRECTORY ${include_dir} DESTINATION "." COMPONENT development)
+
+  set(CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")
+  set(CPACK_COMPONENTS_ALL application development)
+
+  set(CPACK_COMPONENT_APPLICATION_REQUIRED 1)
+  set(CPACK_COMPONENT_DEVELOPMENT_DISABLED 1)
+
+  set(CPACK_COMPONENT_APPLICATION_DISPLAY_NAME "TOL-GNU Application")
+  set(CPACK_COMPONENT_DEVELOPMENT_DISPLAY_NAME "C++ Headers & Libraries")
+
+  set(CPACK_COMPONENT_APPLICATION_DESCRIPTION 
+    "Main components of TOL-GNU Application")
+  set(CPACK_COMPONENT_DEVELOPMENT_DESCRIPTION
+    "C/C++ header files and libraries for development purposes")
 endif( WIN32 )
 
 configure_file( ${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in ${PROJECT_BINARY_DIR}/CPackOptions.cmake )
 
-# http://stackoverflow.com/questions/21144655/customizing-nsis-installer-using-cpack
-# ...
+# => http://stackoverflow.com/questions/21144655/customizing-nsis-installer-using-cpack
+# => http://www.cmake.org/Wiki/CMake:CPackPackageGenerators
 
 set(CPACK_PACKAGE_NAME "TOL-GNU")
@@ -37 +67 @@
 
 set(CPACK_PROPERTIES_FILE "${PROJECT_BINARY_DIR}/CPackOptions.cmake")
-#set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}\\\\NSIS\\\\splash-gnu.bmp")
-#string(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
+
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/tol/COPYING" )
   string(REPLACE "/" "\\\\" CPACK_RESOURCE_FILE_LICENSE ${CPACK_RESOURCE_FILE_LICENSE})
@@ -48 +77 @@
 set(CPACK_NSIS_HELP_LINK "www.tol-project.org")
 
-# http://www.mantidproject.org/NSIS_CPACK_Customisations
-# http://nsis.sourceforge.net/Environmental_Variables:_append,_prepend,_and_remove_entries
+# => http://www.mantidproject.org/NSIS_CPACK_Customisations
+# => http://nsis.sourceforge.net/Environmental_Variables:_append,_prepend,_and_remove_entries
+
+# => http://www.cmake.org/Wiki/CMake:CPackNSISAdvancedTips
 
 if( WIN32 )
-
   # nombre del paquete en el instalador
   set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
@@ -63 +93 @@
     SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000
   ") 
-
   set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
     DeleteRegValue HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" TOLGNU_ROOT
@@ -80 +109 @@
   # crea otros accesos directos
   set(CPACK_NSIS_MENU_LINKS "http://www.tol-project.org" "Tol-Project Site")
+endif( WIN32 )
 
-endif( WIN32 )
 include(CPack)