summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt4
-rw-r--r--cmake/opentrack-platform.cmake5
-rw-r--r--tracker-rs/rs_impl/CMakeLists.txt2
-rw-r--r--x-plane-plugin/CMakeLists.txt4
4 files changed, 4 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5be882d3..8a56974b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,7 @@
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
-set(CMAKE_C_LINKER_PREFERENCE CXX)
-set(CMAKE_CXX_LINKER_PREFERENCE CXX)
-set(CMAKE_C_LINKER_PREFERENCE_PROPAGATES ON)
+set(CMAKE_C_LINKER_PREFERENCE_PROPAGATES OFF)
set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index d987f5cd..107130f5 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -64,11 +64,6 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
set(CMAKE_COMPILER_IS_CLANG TRUE)
endif()
-if((NOT CMAKE_COMPILER_IS_GNUCXX) EQUAL (NOT (NOT CMAKE_COMPILER_IS_GNUCC)))
- # this build system has logic errors otherwise
- message(FATAL_ERROR "use either use both gcc and g++ or neither")
-endif()
-
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(LINUX TRUE)
endif()
diff --git a/tracker-rs/rs_impl/CMakeLists.txt b/tracker-rs/rs_impl/CMakeLists.txt
index d4bf0925..97c6fd99 100644
--- a/tracker-rs/rs_impl/CMakeLists.txt
+++ b/tracker-rs/rs_impl/CMakeLists.txt
@@ -5,7 +5,7 @@ if(WIN32)
target_link_libraries(opentrack-tracker-rs-impl advapi32)
# for SDK headers
- if(CMAKE_COMPILER_IS_GNUCC)
+ if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-fpermissive -Wno-error -w
#-Wno-missing-field-initializers -Wno-switch -Wno-sign-compare
#-Wno-unknown-pragmas -Wno-attributes
diff --git a/x-plane-plugin/CMakeLists.txt b/x-plane-plugin/CMakeLists.txt
index 21809fb3..b827b7ab 100644
--- a/x-plane-plugin/CMakeLists.txt
+++ b/x-plane-plugin/CMakeLists.txt
@@ -1,5 +1,5 @@
if(LINUX OR APPLE)
- set(SDK_XPLANE "" CACHE PATH "Path to X-Plane SDK")
+ set(SDK_XPLANE "" CACHE PATH "Path to the X-Plane SDK")
if(SDK_XPLANE)
otr_module(xplane-plugin NO-QT)
@@ -19,7 +19,7 @@ if(LINUX OR APPLE)
LINK_FLAGS "-rdynamic -nodefaultlibs -fPIC ")
endif()
- if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_COMPILER_IS_CLANGXX)
+ if(CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_COMPILER_IS_CLANG)
set_property(TARGET opentrack-xplane-plugin APPEND_STRING PROPERTY
LINK_FLAGS "-undefined_warning ")
endif()