From 554030bbaa6da16cd8255c65bd2f74a8c1bb47ae Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Tue, 4 Jan 2022 05:33:14 +0100
Subject: [PATCH] cmake: a little refactor

---
 CMakeLists.txt | 9 +++++++--
 Makefile       | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0eea7d8..aec822c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ project(fortuna LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 find_package(Git QUIET)
 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
@@ -23,7 +24,6 @@ endif()
 
 add_subdirectory(lib/fmt EXCLUDE_FROM_ALL)
 add_subdirectory(lib/fmtlog EXCLUDE_FROM_ALL)
-
 add_subdirectory(lib/da_threading EXCLUDE_FROM_ALL)
 
   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
@@ -157,7 +157,8 @@ add_subdirectory(lib/da_threading EXCLUDE_FROM_ALL)
   if(NOT CMAKE_CXX_FLAGS MATCHES "-fPIC")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
   endif(NOT CMAKE_CXX_FLAGS MATCHES "-fPIC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE -pie")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
+  add_compile_options (-fdiagnostics-show-location=once)
 
   if(CMAKE_BUILD_TYPE MATCHES "Debug")
     set(LDFLAGS "${LDFLAGS} -Wl,-Og,–sort-common,–as-needed,-z,now,-pic,-pie")
@@ -187,6 +188,7 @@ add_subdirectory(lib/da_threading EXCLUDE_FROM_ALL)
       set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
     endif(NOT CMAKE_EXE_LINKER_FLAGS MATCHES "-fuse-ld=lld")
   endif()
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_CXX_FLAGS}")
 
 
 set(FORTUNA_SOURCES
@@ -210,6 +212,9 @@ set(FORTUNA_HEADERS
   util.h
   seed_file_management.h)
 add_executable(fortuna ${FORTUNA_SOURCES} ${FORTUNA_HEADERS})
+target_include_directories(fortuna PRIVATE .)
+target_compile_features(fortuna PUBLIC cxx_std_20)
+
 # ref: https://cmake.org/pipermail/cmake/2016-May/063400.html
 target_link_libraries(fortuna
     PRIVATE cryptopp
diff --git a/Makefile b/Makefile
index 03125b0..4c007a0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ cppch = cppcheck
 cppch_args = --language=c++ --std=c++20 --enable=all --verbose --suppress=unmatchedSuppression --suppress=missingIncludeSystem ./*.{cpp,h}
 cpp_flags = CMAKE_CXX_FLAGS=
 c = cmake
-c_args = -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=
+c_args = -G Ninja -DCMAKE_BUILD_TYPE=
 n = ninja
 n_args = -C
 d_folder = cmake-build-debug