Skip to content

Commit 67fc69f

Browse files
committed
More robust compiler check
1 parent cbefc73 commit 67fc69f

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
3131
set(CMAKE_AUTORCC ON)
3232
set(CMAKE_AUTOMOC ON)
3333

34-
if(MSVC)
34+
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
3535
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus")
3636
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
3737
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MD")
3838
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
39-
endif(MSVC)
39+
endif()
4040

4141
# -----------------------------------------------------------------------------
4242
# Dependencies
@@ -167,7 +167,7 @@ set_target_properties(${PROJECT} PROPERTIES
167167
# Miscellaneous
168168
# -----------------------------------------------------------------------------
169169
# Automatically set the debug environment (command + working directory) for MSVC
170-
if(MSVC)
170+
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
171171
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>>)
172172
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">>)
173173
endif()

0 commit comments

Comments
 (0)