Changes to CPACK code for creating installers

Author: StevenAWhite

cmake/packaging/BioGearsLogo.bmp

@@ -5,7 +5,7 @@ set(CPACK_PACKAGE_VENDOR "Applied Resaerch Associates")
 set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_HOMEPAGE_URL "http://biogearsengine.com")
-set(CMAKE_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/BioGearsLogo.bmp")
+set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/biogearslogo_XoQ_icon.ico")
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "BioGears/${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_MAJOR ${${ROOT_PROJECT_NAME}_VERSION_MAJOR} )      
@@ -17,35 +17,86 @@ set(CPACK_PACKAGE_VERSION_TWEAK ${${ROOT_PROJECT_NAME}_VERSION_TWEAK} )
 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 backlashes.
-  #set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/BioGearsLogo.bmp")
-  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\MyExecutable.exe")
-  set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} My Famous Project")
+set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\BioGearsLogo.bmp")
+  set(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_CURRENT_SOURCE_DIR}/biogearslogo_XoQ_icon.ico")
+  set(CPACK_NSIS_DISPLAY_NAME "BioGears")
   set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.biogearsengine.com")
   set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.biogearsengine.com")
   set(CPACK_NSIS_CONTACT "[email protected]")
   set(CPACK_NSIS_MODIFY_PATH ON)
+  set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 
   set(CPACK_WIX_UPGRADE_GUID "54B0EF16-257C-4325-A64B-630FFB302F16")
-  set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/BioGearsLogo.bmp")
+  set(CPACK_WIX_PRODUCT_ICON "${CMAKE_CURRENT_SOURCE_DIR}/biogearslogo_XoQ_icon.ico")
   set(CPACK_WIX_PROGRAM_MENU_FOLDER "BioGears")
+  set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/WIX_UI_BANNER.png")
+  set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/WIX_UI_DIALOG.png")
+  set(CPACK_WIX_PROPERTY_ARPCOMMENTS "Command line utilities for BioGears ${${ROOT_PROJECT_NAME}_VERSION_TAG}")
+  set(CPACK_WIX_PROPERTY_ARPHELPLINK  "https://biogearsengine.com")
+  set(ARPURLINFOABOUT  "https://biogearsengine.com")
+
+  install(CODE "
+    include(BundleUtilities)
+
+    function(EXELIST result curdir)
+      file(GLOB children RELATIVE \${curdir} \${curdir}/*)
+      set(artifactList \"\")
+      foreach(child \${children})
+        if(NOT IS_DIRECTORY \${curdir}/\${child} AND \${child} MATCHES \".*${CMAKE_EXECUTABLE_SUFFIX}\" )
+          list(APPEND artifactList \${curdir}/\${child})
+        set(\${result} \${artifactList} PARENT_SCOPE)
+        return()
+        endif()
+      endforeach()
+    endfunction()
+
+    string(TOUPPER \${CMAKE_INSTALL_CONFIG_NAME} CONFIG)
+    if( NOT UNIX )
+      set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY \${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_\${CONFIG}} )
+      set( CMAKE_LIBRARY_OUTPUT_DIRECTORY \${CMAKE_LIBRARY_OUTPUT_DIRECTORY_\${CONFIG}} )
+      set( CMAKE_RUNTIME_OUTPUT_DIRECTORY \${CMAKE_RUNTIME_OUTPUT_DIRECTORY_\${CONFIG}} )
+    endif()
+    
+
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
+
+    foreach(_dir IN LISTS CMAKE_PREFIX_PATH)
+      list(APPEND THIRD_PARTY  \"\${_dir}\")
+      list(APPEND THIRD_PARTY_LIB \"\${_dir}/lib\")
+      list(APPEND THIRD_PARTY_BIN \"\${_dir}/bin\")
+    endforeach()
+    
+    EXELIST(artifacts \${CMAKE_INSTALL_PREFIX}/bin )
+
+    message(\"CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}\")
+    message(\"artifacts=\${artifacts}\")
+
+    foreach( artifact IN LISTS artifacts)
+      fixup_bundle(\${artifact}
+                      \"\"
+                    \"\${THIRD_PARTY_LIB};\${THIRD_PARTY_BIN}\"
+        )
+    endforeach()
+  "         
+  )
 
   install(DIRECTORY 
     ${PROJECT_SOURCE_DIR}/share/xsd 
-    DESTINATION runtime/${${ROOT_PROJECT_NAME}_VERSION_TAG}/
+    DESTINATION bin/
     FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
     )
 
 install(DIRECTORY 
     ${PROJECT_SOURCE_DIR}/share/data/
-    DESTINATION runtime/${${ROOT_PROJECT_NAME}_VERSION_TAG}/
+    DESTINATION bin/
     FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
     FILES_MATCHING 
     PATTERN "*.xml"
     PATTERN "*.xlsx"
     )
 install(DIRECTORY 
     ${PROJECT_SOURCE_DIR}/share/Scenarios
-    DESTINATION runtime/${${ROOT_PROJECT_NAME}_VERSION_TAG}/
+    DESTINATION bin/
     FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
     FILES_MATCHING 
     PATTERN "*.xml"
@@ -55,6 +106,6 @@ else()
   set(CPACK_STRIP_FILES "")
   set(CPACK_SOURCE_STRIP_FILES "")
 endif()
-set(CPACK_PACKAGE_EXECUTABLES "bg-cli" "bg-scenario")
+set(CPACK_PACKAGE_EXECUTABLES "bg-cli;Command Line" "bg-scenario;Scenario Driver")
 
 include(CPack)

cmake/packaging/BioGearsLogo.png

@@ -46,7 +46,9 @@ set_target_properties(bg-cli
   CXX_STANDARD 14
   VS_DEBUGGER_WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/runtime
   )
-
+if(WIN32)
+  target_sources(bg-cli  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bg-cli.rc)
+endif()
 target_compile_definitions(bg-cli PRIVATE DEBUG_POSTFIX=$<$<CONFIG:Debug>:"${CMAKE_DEBUG_POSTFIX}">)
 target_compile_options(bg-cli PRIVATE $<$<PLATFORM_ID:Windows>:/bigobj> PRIVATE $<$<PLATFORM_ID:Windows>:/MP${${ROOT_PROJECT_NAME}_BUILD_PARALLEL_LEVEL}>)
 target_include_directories(bg-cli PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src/utils/ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/)
@@ -71,7 +73,9 @@ set_target_properties(bg-scenario
   CXX_STANDARD 14
   VS_DEBUGGER_WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/runtime
   )
-
+  if(WIN32)
+    target_sources(bg-scenario  PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bg-scenario.rc)
+  endif()
   set_property(INSTALL "$<TARGET_FILE_NAME:bg-scenario>"
   PROPERTY CPACK_START_MENU_SHORTCUTS "BioGears Scenario Driver"
 )