summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-12-08 21:24:37 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-12-08 21:31:04 +0100
commit174f403656f35ef11bbd90f8c1c885b03e3ff7d2 (patch)
tree0415f291b3b440124bed57dced39b987a06f0161
parent709fe557a3a5c2dc8675472dac9325f8efdff004 (diff)
cruft
-rw-r--r--cmake/mingw-w64.cmake2
-rw-r--r--cmake/opentrack-platform.cmake4
-rw-r--r--x-plane-plugin/CMakeLists.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake
index 1879ab3a..e96b3d6d 100644
--- a/cmake/mingw-w64.cmake
+++ b/cmake/mingw-w64.cmake
@@ -61,7 +61,7 @@ set(cc "")
#set(cc "-fdump-statistics-details -fdump-ipa-cgraph")
set(clang-warns "")
-if(CMAKE_COMPILER_IS_CLANG)
+if(CMAKE_COMPILER_IS_CLANGXX)
set(clang-warns "-Wweak-vtables")
endif()
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index 0cdb1d57..a72c4918 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -40,12 +40,12 @@ if(APPLE)
endif()
if(MSVC AND MSVC_VERSION LESS "1915" AND NOT ".${CMAKE_CXX_COMPILER_ID}" STREQUAL ".Clang")
- message(FATAL_ERROR "Visual Studio too old. Use Visual Studio 2017 Preview or newer.")
+ message(FATAL_ERROR "Visual Studio too old. Use Visual Studio 2017 or newer.")
endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(CMAKE_COMPILER_IS_GNUCXX TRUE)
- set(CMAKE_COMPILER_IS_CLANG TRUE)
+ set(CMAKE_COMPILER_IS_CLANGXX TRUE)
endif()
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
diff --git a/x-plane-plugin/CMakeLists.txt b/x-plane-plugin/CMakeLists.txt
index 23881ca3..21809fb3 100644
--- a/x-plane-plugin/CMakeLists.txt
+++ b/x-plane-plugin/CMakeLists.txt
@@ -19,7 +19,7 @@ if(LINUX OR APPLE)
LINK_FLAGS "-rdynamic -nodefaultlibs -fPIC ")
endif()
- if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_COMPILER_IS_CLANG)
+ if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_COMPILER_IS_CLANGXX)
set_property(TARGET opentrack-xplane-plugin APPEND_STRING PROPERTY
LINK_FLAGS "-undefined_warning ")
endif()