Modernize CMake scripts

Add CPack support

Try to remove unnecessary CMake calls

Author: HexDecimal

.github/workflows/builds.yml

@@ -15,6 +15,8 @@ defaults:
 
 env:
   VCPKG_FETCH_DEPTH: 1 # Depth to fetch vcpkg commits, must include the baseline.
+  CMAKE_BUILD_DIR: build
+  VCPKG_ROOT: ${{github.workspace}}/vcpkg
 
 jobs:
   CMake:
@@ -35,6 +37,7 @@ jobs:
             triplet: x64-linux
             shared: dynamic
             config: Release
+            cpack: true
 
           - os: macos-14
             triplet: arm64-osx
@@ -44,6 +47,7 @@ jobs:
             triplet: arm64-osx
             shared: dynamic
             config: Release
+            cpack: true
 
           - os: windows-2022
             triplet: x64-windows
@@ -53,6 +57,7 @@ jobs:
             triplet: x64-windows
             shared: dynamic
             config: Release
+            cpack: true
 
     env:
       CMAKE_BUILD_DIR: build
@@ -111,6 +116,21 @@ jobs:
       - name: CMake test install
         run: |
           cmake --install ${{env.CMAKE_BUILD_DIR}} --config ${{matrix.config}}
+      - name: CPack
+        if: matrix.cpack
+        run: |
+          cpack --config ${{env.CMAKE_BUILD_DIR}}/CPackConfig.cmake --verbose
+      - name: Upload CPack
+        if: matrix.cpack
+        uses: actions/upload-artifact@v4
+        with:
+          name: cpack-dist-${{ matrix.triplet }}
+          path: |
+            *.zip
+            *.tar.*
+          retention-days: 3
+          compression-level: 0
+          if-no-files-found: error
 
   coverage:
     runs-on: ${{ matrix.os }}

.vscode/cspell.json

@@ -84,6 +84,7 @@
         "CONTENTVERSION",
         "contextdata",
         "cottog",
+        "cpack",
         "CPPDEFINES",
         "CRGB",
         "CRGBRGB",

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.13...3.21)
+cmake_minimum_required(VERSION 3.23...4.0)
 
 if(NOT DEFINED CMAKE_TOOLCHAIN_FILE)
     set(CMAKE_TOOLCHAIN_FILE
@@ -34,46 +34,20 @@ if(CONAN_FILE)
     conan_basic_setup(TARGETS)
 endif()
 
-if(NOT CMAKE_INSTALL_BINDIR)
-    set(CMAKE_INSTALL_BINDIR "bin" CACHE STRING "")
-endif()
-if(NOT CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "")
-endif()
-if(NOT CMAKE_INSTALL_DATAROOTDIR)
-    set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE STRING "")
-endif()
-if(NOT CMAKE_INSTALL_INCLUDEDIR)
-    set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "")
-endif()
-
-if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-endif()
-if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
-endif()
-if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
-endif()
-
-add_library(${PROJECT_NAME})
-add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 add_subdirectory(src)
 
-set_target_properties(${PROJECT_NAME} PROPERTIES
-    C_VISIBILITY_PRESET hidden
-    CXX_VISIBILITY_PRESET hidden
-    VISIBILITY_INLINES_HIDDEN OFF
-    VERSION ${PROJECT_VERSION}
-    SOVERSION ${PROJECT_VERSION_MAJOR}
-)
-
-set(VCPKG_MANIFEST_NO_DEFAULT_FEATURES ON)
-
 if(LIBTCODFOV_TESTS)
     add_subdirectory(tests)
 endif()
 if(LIBTCODFOV_TOOLS)
     add_subdirectory(src/fovtool)
 endif()
+
+if (WIN32)
+    set(CPACK_GENERATOR "ZIP")
+else()
+    set(CPACK_GENERATOR "TGZ")
+endif()
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+include(CPack)

src/CMakeLists.txt

@@ -1,15 +1,23 @@
-cmake_minimum_required (VERSION 3.13...3.21)
+cmake_minimum_required(VERSION 3.23...4.0)
+
+add_library(${PROJECT_NAME})
+add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 
 target_compile_features(${PROJECT_NAME} PUBLIC c_std_99 cxx_std_17)
-set_property(TARGET ${PROJECT_NAME} PROPERTY C_STANDARD 99)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
-set_property(TARGET ${PROJECT_NAME} PROPERTY C_STANDARD_REQUIRED TRUE)
-set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD_REQUIRED TRUE)
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    C_STANDARD 99
+    CXX_STANDARD 17
+    C_STANDARD_REQUIRED TRUE
+    CXX_STANDARD_REQUIRED TRUE
+    C_VISIBILITY_PRESET hidden
+    CXX_VISIBILITY_PRESET hidden
+    VISIBILITY_INLINES_HIDDEN OFF
+    VERSION ${PROJECT_VERSION}
+)
 
 target_include_directories(${PROJECT_NAME} PRIVATE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include/libtcod-fov>
 )
-
 target_include_directories(${PROJECT_NAME} INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
 )

src/fovtool/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.13...3.21)
+cmake_minimum_required(VERSION 3.23...4.0)
 
 project(
     fovtool

tests/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.13...3.21)
+cmake_minimum_required(VERSION 3.23...4.0)
 project(PackageTest CXX)
 
 set(_IMPORT_CHECK_TARGETS "")  # Suppress undefined variable in Catch2Targets.cmake.
@@ -17,9 +17,6 @@ add_executable(unittest unittest.cpp ${SRC_FILES})
 target_link_libraries(unittest libtcod-fov::libtcod-fov Catch2::Catch2 Catch2::Catch2WithMain)
 target_compile_features(unittest PUBLIC cxx_std_20)
 target_compile_definitions(unittest PRIVATE CATCH_CONFIG_ENABLE_BENCHMARKING)
-if (MSVC)
-    target_compile_options(unittest PRIVATE /utf-8)
-endif()
 
 if(MSVC)
   target_compile_options(unittest PRIVATE /W4)