Skip to content

Commit 9ab8e36

Browse files
committed
Update cmake
1 parent 04544f5 commit 9ab8e36

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.17)
1+
cmake_minimum_required(VERSION 3.22)
22

33
option(MV_UNITY_BUILD "Combine target source files into batches for faster compilation" OFF)
44

@@ -19,16 +19,15 @@ set(CMAKE_AUTOMOC ON)
1919
if(MSVC)
2020
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus")
2121
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
22-
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
23-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
22+
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
2423
endif(MSVC)
2524

2625
# -----------------------------------------------------------------------------
2726
# Dependencies
2827
# -----------------------------------------------------------------------------
2928
find_package(Qt6 COMPONENTS Widgets WebEngineWidgets OpenGL OpenGLWidgets REQUIRED)
3029

31-
find_package(ManiVault COMPONENTS Core PointData ClusterData ColorData ImageData CONFIG)
30+
find_package(ManiVault COMPONENTS Core PointData ClusterData ColorData ImageData CONFIG QUIET)
3231

3332
# -----------------------------------------------------------------------------
3433
# Source files
@@ -114,7 +113,7 @@ target_include_directories(${PROJECT} PRIVATE "${ManiVault_INCLUDE_DIR}")
114113
# -----------------------------------------------------------------------------
115114
# Target properties
116115
# -----------------------------------------------------------------------------
117-
target_compile_features(${PROJECT} PRIVATE cxx_std_17)
116+
target_compile_features(${PROJECT} PRIVATE cxx_std_20)
118117

119118
if(MV_UNITY_BUILD)
120119
set_target_properties(${PROJECT} PROPERTIES UNITY_BUILD ON)
@@ -159,6 +158,6 @@ set_target_properties(${PROJECT}
159158
# -----------------------------------------------------------------------------
160159
# Automatically set the debug environment (command + working directory) for MSVC
161160
if(MSVC)
162-
set_property(TARGET ${PROJECT} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/debug,${ManiVault_INSTALL_DIR}/release>)
163-
set_property(TARGET ${PROJECT} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/debug/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/release/ManiVault Studio.exe">)
161+
set_property(TARGET ${PROJECT} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<IF:$<CONFIG:DEBUG>,${ManiVault_INSTALL_DIR}/Debug,$<IF:$<CONFIG:RELWITHDEBINFO>,${ManiVault_INSTALL_DIR}/RelWithDebInfo,${ManiVault_INSTALL_DIR}/Release>>)
162+
set_property(TARGET ${PROJECT} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,"${ManiVault_INSTALL_DIR}/Debug/ManiVault Studio.exe",$<IF:$<CONFIG:RELWITHDEBINFO>,"${ManiVault_INSTALL_DIR}/RelWithDebInfo/ManiVault Studio.exe","${ManiVault_INSTALL_DIR}/Release/ManiVault Studio.exe">>)
164163
endif()

0 commit comments

Comments
 (0)