[v3.1.4] from_file(): Resolve symlinks (#17)

* Improve CMake

* [v3.1.4] `from_file()`: Resolve symlinks

Author: karnkaul

.clang-format

@@ -18,13 +18,13 @@ AllowShortIfStatementsOnASingleLine: Always
 AllowShortLoopsOnASingleLine: true
 IndentRequires: true
 IncludeCategories:
-    # Headers in <> with .h extension.
-    - Regex: '<([A-Za-z0-9\/-_])+\.h>'
+    # Headers in "" with a file extension.
+    - Regex: '"([A-Za-z0-9\/-_])+\..*"'
       Priority: 10
-    # Headers in <> with .hpp extension.
-    - Regex: '<([A-Za-z0-9\/-_])+\.hpp>'
+    # Headers in <> with a file extension.
+    - Regex: '<([A-Za-z0-9\/-_])+\..*>'
       Priority: 20
-    # Headers in <> without extension.
+    # Headers in <> without a file extension.
     - Regex: '<([A-Za-z0-9\/-_])+>'
       Priority: 30
 PointerAlignment: Left

.clang-tidy

@@ -2,14 +2,15 @@
 Checks: 'clang-analyzer-*,
 	concurrency-*,
 	cppcoreguidelines-*,
-	-cppcoreguidelines-non-private-member-variables-in-classes,
+	-cppcoreguidelines-avoid-do-while,
 	-cppcoreguidelines-avoid-magic-numbers,
 	-cppcoreguidelines-avoid-const-or-ref-data-members,
-	-cppcoreguidelines-avoid-do-while,
+	-cppcoreguidelines-non-private-member-variables-in-classes,
 	misc-*,
 	-misc-non-private-member-variables-in-classes,
 	-misc-no-recursion,
 	modernize-*,
+	-modernize-use-trailing-return-type,
 	performance-*,
 	portability-*,
 	readability-*,

.editorconfig

@@ -1,19 +1,11 @@
 [*]
 insert_final_newline = true
 charset = utf-8
-indent_size = 4
-indent_style = tab
-# Optional: git will commit as lf, this will only affect local files
-end_of_line = lf
-
-[*.{py,md,yml,sh,cmake,json}]
-indent_style = space
-indent_size = 2
-
-[*.{py,md,yml,sh,cmake,json}.in]
 indent_style = space
 indent_size = 2
+# Optional: git will commit as lf, this will only affect local files
+end_of_line = lf
 
-[CMakeLists.txt]
-indent_style = space
-indent_size = 2
+[*.{hpp,cpp}]
+indent_style = tab
+indent_size = 4

.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

@@ -1,4 +1,4 @@
-#include <djson/build_version.hpp>
+#include "djson/build_version.hpp"
 #include <print>
 
 auto main() -> int { std::println("djson version: {}", dj::build_version_v); }

install_test/exe/main.cpp

@@ -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()

lib/CMakeLists.txt

@@ -1,5 +1,5 @@
 #pragma once
-#include <djson/src_loc.hpp>
+#include "djson/src_loc.hpp"
 #include <string>
 
 namespace dj {

lib/include/djson/error.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include <djson/error.hpp>
-#include <djson/string_table.hpp>
+#include "djson/error.hpp"
+#include "djson/string_table.hpp"
 #include <expected>
 #include <format>
 #include <memory>