From fdd986ec469ff3410feec934442c3dcbb72232db Mon Sep 17 00:00:00 2001 From: jackpoz Date: Mon, 16 Mar 2020 12:59:57 +0100 Subject: [PATCH] Dep: Inherit C++ language version from CMake --- dep/SFMT/CMakeLists.txt | 2 ++ dep/bzip2/CMakeLists.txt | 2 ++ dep/zlib/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dep/SFMT/CMakeLists.txt b/dep/SFMT/CMakeLists.txt index 84f5cc6afc4..0e66f6598e8 100644 --- a/dep/SFMT/CMakeLists.txt +++ b/dep/SFMT/CMakeLists.txt @@ -74,5 +74,7 @@ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64") target_compile_definitions(sfmt PUBLIC -DHAVE_SSE2) endif () +set_target_properties(sfmt PROPERTIES LINKER_LANGUAGE CXX) + # inherit trinitycore generic build options (e.g. fPIC) target_link_libraries(sfmt PRIVATE trinity-dependency-interface) diff --git a/dep/bzip2/CMakeLists.txt b/dep/bzip2/CMakeLists.txt index c04609669d9..5885bb3160c 100644 --- a/dep/bzip2/CMakeLists.txt +++ b/dep/bzip2/CMakeLists.txt @@ -26,6 +26,8 @@ else() add_library(bzip2 STATIC ${sources}) + set_target_properties(bzip2 PROPERTIES LINKER_LANGUAGE CXX) + target_include_directories(bzip2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/dep/zlib/CMakeLists.txt b/dep/zlib/CMakeLists.txt index d1c8295c111..49b25277a2f 100644 --- a/dep/zlib/CMakeLists.txt +++ b/dep/zlib/CMakeLists.txt @@ -39,6 +39,8 @@ else() add_library(zlib STATIC ${zlib_STAT_SRCS}) + set_target_properties(zlib PROPERTIES LINKER_LANGUAGE CXX) + target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})