Always install all of Include instead of splitting it up with targets…

…, and fix some package paths
mikke89 · Mar 16, 2024 · 7e64157 · 7e64157
1 parent 2cc9eb7
commit 7e64157
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 42 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -9,9 +9,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build_type: [Debug, Release]
-        library_linkage: [Dynamic, Static]
         architecture: [win32, win64]
+        library_linkage: [Dynamic, Static]
+        build_type: [Debug, Release]
 
     env:
       GENERATOR: Visual Studio 16 2019
@@ -50,7 +50,7 @@ jobs:
         run: |-
           cp LICENSE.txt Install/LICENSE.txt
           $vcpkg_installed_dir="C:/vcpkg/installed/$env:VCPKG_DEFAULT_TRIPLET/"
-          $destination_dir="./Install/Dependencies/Licenses/"
+          $destination_dir="./Install/Dependencies/"
           $copyright_files = Get-ChildItem -Path "$vcpkg_installed_dir/share" -Filter "copyright" -Recurse | Where-Object { $_.Directory.Name -notmatch '^vcpkg-' }
           mkdir $destination_dir -Force | Out-Null
           foreach ($file in $copyright_files) {
@@ -61,7 +61,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.architecture }}-${{ matrix.build_type }}-${{ matrix.library_linkage }}
+          name: build-${{ matrix.architecture }}-${{ matrix.library_linkage }}-${{ matrix.build_type }}
           path: ${{github.workspace}}/Install/
           if-no-files-found: error
 
@@ -108,7 +108,7 @@ jobs:
           -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"
           -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/Install"
           -DCMAKE_INSTALL_BINDIR="Samples"
-          -DCMAKE_INSTALL_DATAROOTDIR=""
+          -DCMAKE_INSTALL_DATAROOTDIR="."
 
       - name: Build
         run: cmake --build Build --config Release

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -157,6 +157,10 @@ install(EXPORT RmlUiTargets
 	NAMESPACE RmlUi::
 	FILE RmlUiTargets.cmake
 )
+install(DIRECTORY
+	"${CMAKE_CURRENT_SOURCE_DIR}/Include/RmlUi"
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
 
 include(CMakePackageConfigHelpers)
 
@@ -165,7 +169,6 @@ configure_file(
 	"${CMAKE_CURRENT_BINARY_DIR}/install/RmlUiConfig.cmake"
 	@ONLY
 )
-
 # RMLUI_CMAKE_MINIMUM_VERSION_RAISE_NOTICE:
 # From CMake 3.11 use compatibility mode `SameMinorVersion`.
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/install/RmlUiConfigVersion.cmake"
@@ -178,7 +181,6 @@ install(FILES
 	DESTINATION
 	"${RMLUI_INSTALL_TARGETS_DIR}"
 )
-
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules"
 	DESTINATION "${RMLUI_INSTALL_TARGETS_DIR}"
 )

diff --git a/Source/Core/CMakeLists.txt b/Source/Core/CMakeLists.txt
@@ -445,12 +445,3 @@ install(TARGETS rmlui_core
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 install_target_pdb(rmlui_core)
-install(DIRECTORY
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core"
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Config"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)
-install(FILES
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Core.h"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)
diff --git a/Source/Debugger/CMakeLists.txt b/Source/Debugger/CMakeLists.txt
@@ -65,11 +65,3 @@ install(TARGETS rmlui_debugger
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 install_target_pdb(rmlui_debugger)
-install(DIRECTORY
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Debugger"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)
-install(FILES
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Debugger.h"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)
diff --git a/Source/Lottie/CMakeLists.txt b/Source/Lottie/CMakeLists.txt
@@ -8,8 +8,3 @@ target_sources(rmlui_core PRIVATE
 )
 
 target_compile_definitions(rmlui_core PRIVATE "RMLUI_LOTTIE_PLUGIN")
-
-install(DIRECTORY
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Lottie"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)
diff --git a/Source/Lua/CMakeLists.txt b/Source/Lua/CMakeLists.txt
@@ -111,11 +111,3 @@ install(TARGETS rmlui_lua
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 install_target_pdb(rmlui_lua)
-install(DIRECTORY
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Lua"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)
-install(FILES
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/Lua.h"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)
diff --git a/Source/SVG/CMakeLists.txt b/Source/SVG/CMakeLists.txt
@@ -8,8 +8,3 @@ target_sources(rmlui_core PRIVATE
 )
 
 target_compile_definitions(rmlui_core PRIVATE "RMLUI_SVG_PLUGIN")
-
-install(DIRECTORY
-	"${PROJECT_SOURCE_DIR}/Include/RmlUi/SVG"
-	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/RmlUi"
-)