41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b98ab0e..b1fc3de 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -39,6 +39,9 @@ option(ASAN "Use Address Sanitization for Debug version (Windows only for now)"
|
|
# Gin requests C++ 20.
|
|
set(CMAKE_CXX_STANDARD 20)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
+set(CMAKE_AR "gcc-ar")
|
|
+set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> qcs <TARGET> <LINK_FLAGS> <OBJECTS>")
|
|
+set(CMAKE_CXX_ARCHIVE_FINISH true)
|
|
add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
|
|
|
|
# To avoid dependency on WebKit. This also came with MacOS, but as webkit is heavyweight, it is probably a good idea to turn it off for all
|
|
diff --git a/The-Orm/CMakeLists.txt b/The-Orm/CMakeLists.txt
|
|
index 1c7186e..39cebd0 100644
|
|
--- a/The-Orm/CMakeLists.txt
|
|
+++ b/The-Orm/CMakeLists.txt
|
|
@@ -5,20 +5,7 @@
|
|
#
|
|
|
|
cmake_minimum_required(VERSION 3.14)
|
|
-
|
|
-# Get the version from our sub cmakefile
|
|
-execute_process(
|
|
- COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_LIST_DIR}/gitversion.cmake"
|
|
- ERROR_VARIABLE PROJECT_VERSION
|
|
- ERROR_STRIP_TRAILING_WHITESPACE
|
|
-)
|
|
-# Cleanup output
|
|
-string(REGEX REPLACE "^[[:space:]]+|[[:space:]]+$" "" PROJECT_VERSION "${PROJECT_VERSION}")
|
|
-string(REGEX REPLACE "\n$" "" PROJECT_VERSION "${PROJECT_VERSION}")
|
|
-message(STATUS "Project version is '${PROJECT_VERSION}'")
|
|
-
|
|
-# Start project
|
|
-project(KnobKraftOrm VERSION ${PROJECT_VERSION})
|
|
+project(KnobKraftOrm VERSION 2.7.1)
|
|
|
|
# Now you can use PROJECT_DEV_TAG in your CMake scripts or in your code to handle the "-dev" part.
|
|
# For example, you could add a preprocessor definition that your code could use:
|