Ver Fonte

cmake: we only need a C++ compiler for Android, Haiku and UWP

Anonymous Maarten há 1 ano atrás
pai
commit
3184936950
3 ficheiros alterados com 5 adições e 2 exclusões
  1. 3 1
      CMakeLists.txt
  2. 1 0
      cmake/sdlchecks.cmake
  3. 1 1
      test/CMakeLists.txt

+ 3 - 1
CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 set(CMAKE_POLICY_DEFAULT_CMP0091 NEW)
 
 cmake_minimum_required(VERSION 3.0.0...3.5)
-project(SDL2 C CXX)
+project(SDL2 C)
 
 if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
   set(SDL2_SUBPROJECT OFF)
@@ -15,6 +15,7 @@ else()
 endif()
 
 if (HAIKU)
+  enable_language(CXX)
   set(LINKER_LANGUAGE CXX)
 endif()
 
@@ -1787,6 +1788,7 @@ elseif(WINDOWS)
   list(APPEND SOURCE_FILES ${CORE_SOURCES})
 
   if(WINDOWS_STORE)
+    enable_language(CXX)
     file(GLOB WINRT_SOURCE_FILES ${SDL2_SOURCE_DIR}/src/core/winrt/*.c ${SDL2_SOURCE_DIR}/src/core/winrt/*.cpp)
     list(APPEND SOURCE_FILES ${WINRT_SOURCE_FILES})
   endif()

+ 1 - 0
cmake/sdlchecks.cmake

@@ -1249,6 +1249,7 @@ macro(CheckHIDAPI)
 
     if(HAVE_HIDAPI)
       if(ANDROID)
+        enable_language(CXX)
         list(APPEND SOURCE_FILES ${SDL2_SOURCE_DIR}/src/hidapi/android/hid.cpp)
       endif()
       if(IOS OR TVOS)

+ 1 - 1
test/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.0...3.5)
-project(SDL2_test)
+project(SDL2_test C)
 
 include(CheckCCompilerFlag)
 include(CMakeParseArguments)