From 5e02e9384a359b1c5f0815d4756f32e1b89e488d Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 5 May 2026 11:44:33 +0200 Subject: [PATCH 1/3] Use mv project defaults --- CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59655d7..7071d39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,24 +15,16 @@ PROJECT(${PROJECT} # ----------------------------------------------------------------------------- # CMake Options # ----------------------------------------------------------------------------- -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTORCC ON) set(CMAKE_AUTOMOC ON) -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /W3 /MP /permissive- /Zc:__cplusplus") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD") -endif() - # ----------------------------------------------------------------------------- # Dependencies # ----------------------------------------------------------------------------- find_package(Qt6 COMPONENTS Widgets WebEngineWidgets OpenGL OpenGLWidgets REQUIRED) find_package(ManiVault COMPONENTS Core PointData ClusterData ColorData ImageData CONFIG QUIET) +mv_project_defaults() # ----------------------------------------------------------------------------- # Source files From f84b42d1cfcacf3539ff259b680523203275420f Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 5 May 2026 11:51:18 +0200 Subject: [PATCH 2/3] Simplify unity build setup --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7071d39..6b0a02a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,9 +108,9 @@ target_include_directories(${PROJECT} PRIVATE "${ManiVault_INCLUDE_DIR}") # ----------------------------------------------------------------------------- target_compile_features(${PROJECT} PRIVATE cxx_std_20) -if(MV_UNITY_BUILD) - set_target_properties(${PROJECT} PROPERTIES UNITY_BUILD ON) -endif() +set_target_properties(${PROJECT} PROPERTIES + UNITY_BUILD ${MV_UNITY_BUILD} +) # ----------------------------------------------------------------------------- # Target library linking From ea03af9c51c7a80c351403feb18ce4cad3b7625e Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Tue, 5 May 2026 11:51:35 +0200 Subject: [PATCH 3/3] Prefer target based properties --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b0a02a..39453a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ PROJECT(${PROJECT} # CMake Options # ----------------------------------------------------------------------------- set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) # ----------------------------------------------------------------------------- # Dependencies @@ -109,6 +108,7 @@ target_include_directories(${PROJECT} PRIVATE "${ManiVault_INCLUDE_DIR}") target_compile_features(${PROJECT} PRIVATE cxx_std_20) set_target_properties(${PROJECT} PROPERTIES + AUTOMOC ON UNITY_BUILD ${MV_UNITY_BUILD} )