Packaging / install updates

2023-01-29 13:26:25 -05:00
parent 126cd438e1
commit 5e886672da
6 changed files with 240 additions and 151 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,8 +9,67 @@
 add_subdirectory(qtk)

 # Qtk Application
-if (QTK_BUILD_GUI)
+if (QTK_INSTALL_GUI OR QTK_INSTALL_PLUGINS)
  add_subdirectory(app)
+
+  # Install custom Qtk plugins for Qt Designer.
+  if(QTK_INSTALL_PLUGINS)
+    install(
+        TARGETS qtk_library qtk_plugin_library
+        COMPONENT qtk_collection
+        LIBRARY DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
+        ARCHIVE DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
+        RUNTIME DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
+    )
+    install(
+        TARGETS qtk_collection
+        COMPONENT qtk_collection
+        LIBRARY DESTINATION "${QTK_PLUGIN_INSTALL_DIR}"
+        ARCHIVE DESTINATION "${QTK_PLUGIN_INSTALL_DIR}"
+        RUNTIME DESTINATION "${QTK_PLUGIN_INSTALL_DIR}"
+    )
+  endif()
+
+  if(QTK_INSTALL_GUI)
+    install(
+        TARGETS qtk_main qtk_library
+        COMPONENT qtk
+        BUNDLE DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib/static
+        RUNTIME DESTINATION bin
+    )
+
+    qt_generate_deploy_app_script(
+        TARGET qtk_main
+        OUTPUT_SCRIPT QTK_DEPLOY_SCRIPT
+        NO_UNSUPPORTED_PLATFORM_ERROR
+    )
+    install(SCRIPT ${QTK_DEPLOY_SCRIPT} COMPONENT qtk)
+
+    if(WIN32)
+      if(MSVC AND TARGET Qt6::qmake)
+        get_target_property(QT6_QMAKE_LOCATION Qt6::qmake IMPORTED_LOCATION)
+        execute_process(
+            COMMAND "${QT6_QMAKE_LOCATION}" -query QT_INSTALL_PREFIX
+            RESULT_VARIABLE return_code
+            OUTPUT_VARIABLE QT6_INSTALL_PREFIX
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+        file(TO_NATIVE_PATH "${QT6_INSTALL_PREFIX}/bin" QT6_INSTALL_PREFIX)
+
+        set(VSUSER_FILE "${CMAKE_CURRENT_BINARY_DIR}/qtk_main.vcxproj.user")
+        file(WRITE ${VSUSER_FILE} "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
+        file(APPEND ${VSUSER_FILE} "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n")
+        file(APPEND ${VSUSER_FILE} "  <PropertyGroup>\n")
+        file(APPEND ${VSUSER_FILE} "    <LocalDebuggerEnvironment>Path=$(SolutionDir)\\lib\\$(Configuration);${QT6_INSTALL_PREFIX};$(Path)\n")
+        file(APPEND ${VSUSER_FILE} "$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\n")
+        file(APPEND ${VSUSER_FILE} "    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\n")
+        file(APPEND ${VSUSER_FILE} "  </PropertyGroup>\n")
+        file(APPEND ${VSUSER_FILE} "</Project>\n")
+      endif()
+    endif()
+  endif()
 endif()

 write_basic_package_version_file(
@@ -22,20 +81,35 @@ configure_package_config_file(
    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
    INSTALL_DESTINATION lib/cmake/${PROJECT_NAME}
 )
-install(
-    FILES
+
+if (QTK_INSTALL_LIB)
+  install(
+      FILES
      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-    COMPONENT libqtk
-    DESTINATION lib/cmake/${PROJECT_NAME}
-)
-install(
-    EXPORT qtk_export
+      COMPONENT libqtk
+      DESTINATION lib/cmake/${PROJECT_NAME}
+  )
+  install(
+      EXPORT qtk_export
      FILE ${PROJECT_NAME}Targets.cmake
      NAMESPACE ${PROJECT_NAME}::
-    COMPONENT libqtk
-    DESTINATION lib/cmake/${PROJECT_NAME}
-)
+      COMPONENT libqtk
+      DESTINATION lib/cmake/${PROJECT_NAME}
+  )
+  # System install for qtk_library
+  install(
+      TARGETS qtk_library
+      # Associate qtk_library target with qtk-export
+      EXPORT qtk_export
+      COMPONENT libqtk
+      FILE_SET HEADERS DESTINATION include
+      INCLUDES DESTINATION include
+      LIBRARY DESTINATION lib
+      ARCHIVE DESTINATION lib/static
+      RUNTIME DESTINATION bin
+  )
+endif()

 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
 set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
@@ -50,14 +124,41 @@ set(CPACK_PACKAGE_CONTACT "shaunreed.com")
 set(CPACK_THREADS 0)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Qtk")

+# Remove any assimp components if defined by submodule.
+if (QTK_UPDATE_SUBMODULES)
+  get_cmake_property(CPACK_COMPONENTS_ALL COMPONENTS)
+  list(FILTER CPACK_COMPONENTS_ALL EXCLUDE REGEX .*assimp.*)
+  list(REMOVE_ITEM CPACK_COMPONENTS_ALL Unspecified)
+endif()
+
+# Windows
+set(CPACK_NSIS_MODIFY_PATH ON)
+set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+set(
+    CPACK_NSIS_CREATE_ICONS_EXTRA
+    "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Qtk.lnk' '$INSTDIR\\\\qtk_main.exe'"
+)
+set(
+    CPACK_NSIS_DELETE_ICONS_EXTRA
+    "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Qtk.lnk'"
+)
+# TODO: Icons for NSIS installer.
+#set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/resources/icon.png")
+#set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/resources/icon.png")
+
 # Debian
+# TODO: Fix output sharedlib path.
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL})
-set(CPACK_INSTALL_SCRIPTS ${QTK_DEPLOY_SCRIPT})
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+#set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local/)

 # OSX
+# TODO: Fix OSX appbundle error.
 set(CPACK_BUNDLE_NAME ${PROJECT_NAME})
 set(CPACK_BUNDLE_PLIST $<TARGET_BUNDLE_CONTENT_DIR:qtk_main>/Info.plist)
 set(CPACK_BUNDLE_ICON ${QTK_OSX_ICONS})
+
+# Platform defaults for source bundles.
 if(WIN32)
  set(CPACK_SOURCE_GENERATOR ZIP)
 else()
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -23,7 +23,7 @@ set(
    toolbox.h
    treeview.h
 )
-qt_add_library(qtk_plugin_library STATIC)
+qt_add_library(qtk_plugin_library STATIC EXCLUDE_FROM_ALL)
 target_sources(
    qtk_plugin_library PRIVATE
    "${QTK_PLUGIN_LIBRARY_SOURCES}"
@@ -31,28 +31,11 @@ target_sources(
 )
 target_link_libraries(qtk_plugin_library PUBLIC Qt6::UiPlugin qtk_library)

-install(
-    TARGETS qtk_plugin_library
-    COMPONENT qtk_collection
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib/static
-    RUNTIME DESTINATION bin
-)
-
-# Install plugin library to Qt Creator for Designer plugin integration.
-#install(
-#    TARGETS qtk_plugin_library
-#    EXCLUDE_FROM_ALL
-#    LIBRARY DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
-#    ARCHIVE DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
-#    RUNTIME DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
-#)
-
 ################################################################################
 # Qtk Widget Collection Plugin
 ################################################################################
 # Create a Qt Designer plugin for a collection of widgets from our library.
-qt_add_plugin(qtk_collection STATIC)
+qt_add_plugin(qtk_collection SHARED EXCLUDE_FROM_ALL)
 target_sources(
    qtk_collection PRIVATE
    widgetplugincollection.cpp widgetplugincollection.h
@@ -60,22 +43,6 @@ target_sources(
 )
 target_link_libraries(qtk_collection PUBLIC qtk_plugin_library)

-install(
-    TARGETS qtk_collection
-    COMPONENT qtk_collection
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib/static
-    RUNTIME DESTINATION bin
-)
-
-#install(
-#    TARGETS qtk_collection
-#    EXCLUDE_FROM_ALL
-#    LIBRARY DESTINATION "${QTK_PLUGIN_INSTALL_DIR}"
-#    ARCHIVE DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
-#    RUNTIME DESTINATION "${QTK_PLUGIN_INSTALL_DIR}"
-#)
-
 ################################################################################
 # Final Qtk Application
 ################################################################################
@@ -109,34 +76,3 @@ set_target_properties(
      MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
      MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
 )
-
-install(
-    TARGETS qtk_main
-    COMPONENT qtk
-    BUNDLE DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib/static
-    RUNTIME DESTINATION bin
-)
-
-qt_generate_deploy_app_script(
-    TARGET qtk_main
-    FILENAME_VARIABLE QTK_DEPLOY_SCRIPT
-    NO_UNSUPPORTED_PLATFORM_ERROR
-)
-install(SCRIPT ${QTK_DEPLOY_SCRIPT} COMPONENT qtk)
-
-if(WIN32)
-  if(MSVC AND TARGET Qt6::qmake)
-    set(VSUSER_FILE "${CMAKE_CURRENT_BINARY_DIR}/qtk_main.vcxproj.user")
-    file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/extern/assimp/assimp/bin" assimp_bin)
-    file(WRITE ${VSUSER_FILE} "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n")
-    file(APPEND ${VSUSER_FILE} "<Project xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">\n")
-    file(APPEND ${VSUSER_FILE} "  <PropertyGroup>\n")
-    file(APPEND ${VSUSER_FILE} "    <LocalDebuggerEnvironment>Path=$(SolutionDir)\\lib\\$(Configuration);${qt6_install_prefix};${assimp_bin};$(Path)\n")
-    file(APPEND ${VSUSER_FILE} "$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>\n")
-    file(APPEND ${VSUSER_FILE} "    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>\n")
-    file(APPEND ${VSUSER_FILE} "  </PropertyGroup>\n")
-    file(APPEND ${VSUSER_FILE} "</Project>\n")
-  endif()
-endif()
--- a/src/qtk/CMakeLists.txt
+++ b/src/qtk/CMakeLists.txt
@@ -44,7 +44,7 @@ set(
 )

 qt6_add_big_resources(QTK_LIBRARY_SOURCES "${QTK_RESOURCES}/resources.qrc")
-qt_add_library(qtk_library STATIC)
+qt_add_library(qtk_library STATIC EXCLUDE_FROM_ALL)
 target_sources(qtk_library PRIVATE ${QTK_LIBRARY_SOURCES})
 target_sources(
    qtk_library PUBLIC
@@ -78,24 +78,5 @@ if(WIN32)
  target_link_libraries(qtk_library PUBLIC OpenGL::GL)
 endif()

-# System install for qtk_library
-install(
-    TARGETS qtk_library
-    # Associate qtk_library target with qtk-export
-    EXPORT qtk_export
-    COMPONENT libqtk
-    FILE_SET HEADERS DESTINATION include
-    INCLUDES DESTINATION include
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib/static
-    RUNTIME DESTINATION bin
-)
-
+#install(SCRIPT ${LIBQTK_DEPLOY_SCRIPT} COMPONENT libqtk)
 ## Install qtk_library to Qt Designer to support widget plugins.
-#install(
-#    TARGETS qtk_library
-#    EXCLUDE_FROM_ALL
-#    LIBRARY DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
-#    ARCHIVE DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
-#    RUNTIME DESTINATION "${QTK_PLUGIN_LIBRARY_DIR}"
-#)