|
@@ -84,17 +84,17 @@ if (MSVC)
|
|
|
endif()
|
|
|
|
|
|
if (MSVC AND NOT USE_MSVC_RUNTIME_LIBRARY_DLL)
|
|
|
- if (${CMAKE_VERSION} VERSION_LESS 3.15)
|
|
|
+ if (CMAKE_VERSION VERSION_LESS 3.15)
|
|
|
foreach (flag CMAKE_C_FLAGS
|
|
|
CMAKE_C_FLAGS_DEBUG
|
|
|
CMAKE_C_FLAGS_RELEASE
|
|
|
CMAKE_C_FLAGS_MINSIZEREL
|
|
|
CMAKE_C_FLAGS_RELWITHDEBINFO)
|
|
|
|
|
|
- if (${flag} MATCHES "/MD")
|
|
|
+ if (flag MATCHES "/MD")
|
|
|
string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}")
|
|
|
endif()
|
|
|
- if (${flag} MATCHES "/MDd")
|
|
|
+ if (flag MATCHES "/MDd")
|
|
|
string(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}")
|
|
|
endif()
|
|
|
|
|
@@ -269,7 +269,7 @@ if (_GLFW_WAYLAND)
|
|
|
check_include_files(xkbcommon/xkbcommon-compose.h HAVE_XKBCOMMON_COMPOSE_H)
|
|
|
check_function_exists(memfd_create HAVE_MEMFD_CREATE)
|
|
|
|
|
|
- if (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"))
|
|
|
+ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
|
find_package(EpollShim)
|
|
|
if (EPOLLSHIM_FOUND)
|
|
|
list(APPEND glfw_INCLUDE_DIRS "${EPOLLSHIM_INCLUDE_DIRS}")
|