From 47e0d741730dbd0c4f8c28e6b391efc814f0c988 Mon Sep 17 00:00:00 2001 From: Wend4r <47463683+Wend4r@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:04:04 +0300 Subject: [PATCH 1/4] CMake (Windwos): add `MultiThreaded` build --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3c91572..3063737d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,6 +177,10 @@ else() endif() add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) +if(WIN32) + set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +endif() + target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) target_precompile_headers(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/pch.hpp) From f0541015d60fd0ed565ce58fb29e957fc295501d Mon Sep 17 00:00:00 2001 From: Wend4r <47463683+Wend4r@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:05:07 +0300 Subject: [PATCH 2/4] CMake (MacOS): do `x86_64` build --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3063737d..d2ee5146 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,6 +179,8 @@ add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) if(WIN32) set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") +elseif(UNIX AND APPLE) + set_target_properties(${PROJECT_NAME} PROPERTIES OSX_ARCHITECTURES "x86_64") endif() target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) From 2cb32eb126e9c6e3d3a296bfc4b1ce44f8f18d65 Mon Sep 17 00:00:00 2001 From: Wend4r <47463683+Wend4r@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:05:37 +0300 Subject: [PATCH 3/4] Revert "CMake (MacOS): do `x86_64` build" This reverts commit f0541015d60fd0ed565ce58fb29e957fc295501d. --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2ee5146..3063737d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -179,8 +179,6 @@ add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) if(WIN32) set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -elseif(UNIX AND APPLE) - set_target_properties(${PROJECT_NAME} PROPERTIES OSX_ARCHITECTURES "x86_64") endif() target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) From c83062c371eda1c9e383d0d8a8db49ed1063f7f4 Mon Sep 17 00:00:00 2001 From: Wend4r <47463683+Wend4r@users.noreply.github.com> Date: Wed, 13 Nov 2024 22:43:41 +0300 Subject: [PATCH 4/4] CMake: replace `"` to `\"` in `GIT_COMMIT_SUBJECT` --- cmake/git.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/git.cmake b/cmake/git.cmake index 8abb2ff7..054733fa 100644 --- a/cmake/git.cmake +++ b/cmake/git.cmake @@ -59,6 +59,8 @@ else() set(GIT_TAG "UNKNOWN") endif() +string(REPLACE "\"" "\\\"" GIT_COMMIT_SUBJECT ${GIT_COMMIT_SUBJECT}) + add_library(plugify-git INTERFACE) target_compile_definitions(plugify-git INTERFACE PLUGIFY_GIT_COMMIT_HASH="${GIT_SHA1}"