Improve CMake

Author: karnkaul

.github/workflows/ci.yml

@@ -60,7 +60,7 @@ jobs:
             uname -m
             sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 10
       - name: configure
-        run: cmake -S . --preset=ninja-gcc -B build -DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14
+        run: cmake -S . --preset=ninja-gcc -B build
       - name: build debug
         run: cmake --build build --config=Debug -- -v
       - name: build release

CMakeLists.txt

@@ -6,8 +6,9 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_DEBUG_POSTFIX "-d")
 
 include(version.cmake)
+set(package_name djson)
 
-project(djson VERSION ${djson_version})
+project(${package_name} VERSION ${djson_version})
 
 option(DJ_INSTALL "Setup djson install" ${PROJECT_IS_TOP_LEVEL})
 option(DJ_BUILD_TESTS "Build djson tests" ${PROJECT_IS_TOP_LEVEL})
@@ -16,6 +17,26 @@ configure_file(Doxyfile.in Doxyfile @ONLY)
 
 add_subdirectory(lib)
 
+if(DJ_INSTALL)
+  message(STATUS "[${package_name}] setting up install")
+  include(GNUInstallDirs)
+
+  set(install_dst "${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}")
+
+  install(
+    TARGETS ${package_name}
+    EXPORT ${package_name}-targets
+    FILE_SET HEADERS
+  )
+
+  install(
+    EXPORT ${package_name}-targets
+    DESTINATION "${install_dst}"
+    NAMESPACE ${package_name}::
+    FILE ${package_name}-config.cmake
+  )
+endif()
+
 if(DJ_BUILD_TESTS)
   enable_testing()
   add_subdirectory(tests)

config.cmake.in

@@ -29,21 +29,3 @@ target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_23)
 target_link_libraries(${PROJECT_NAME} PRIVATE
   $<$<BOOL:${MINGW}>:stdc++exp>
 )
-
-if(DJ_INSTALL)
-  message(STATUS "[djson] setting up install")
-  include(GNUInstallDirs)
-
-  install(
-    TARGETS djson
-    EXPORT djson-targets
-    FILE_SET HEADERS
-  )
-
-  install(
-    EXPORT djson-targets
-    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/djson"
-    NAMESPACE djson::
-    FILE djson-config.cmake
-  )
-endif()