Skip to content

Commit cd64470

Browse files
committed
cmake: use compiler detection instead of “MSVC” and “NOT MSVC AND WIN32”
1 parent 0c55b44 commit cd64470

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ if (USE_EXTERNAL_DEPS AND NOT DAEMON_TARGET_SYSTEM_NaCl)
206206

207207
set(DEPS_ARCH "${DAEMON_ARCH}")
208208

209-
if (MSVC)
209+
if (DAEMON_CXX_COMPILER_MSVC)
210210
set(DEPS_COMPILER msvc)
211-
elseif (WIN32)
211+
elseif (DAEMON_CXX_COMPILER_MinGW)
212212
set(DEPS_COMPILER mingw)
213213
else()
214214
set(DEPS_COMPILER default)
@@ -834,9 +834,9 @@ macro(AddApplicationInternal Target Executable)
834834
# Append Windows specific manifests.
835835
# Adding the .manifest as a source works better for MSVC, but it has no
836836
# effect for MinGW (https://gitlab.kitware.com/cmake/cmake/-/issues/23244).
837-
if (MINGW)
837+
if (DAEMON_CXX_COMPILER_MSVC)
838838
target_sources(${Target} PRIVATE ${ENGINE_DIR}/sys/windows-resource/manifest.rc)
839-
elseif (WIN32)
839+
elseif (DAEMON_CXX_COMPILER_MinGW)
840840
target_sources(${Target} PRIVATE ${ENGINE_DIR}/sys/windows-resource/supported-os.manifest)
841841
endif()
842842

0 commit comments

Comments
 (0)