From d04767eae23748c6937709b4f371702b84153675 Mon Sep 17 00:00:00 2001 From: waddlesplash Date: Tue, 16 May 2017 16:52:18 -0400 Subject: [PATCH] All: Don't use enable_language(CXX) in the Qt subdirectory. Doing so causes CMake to create a pseudo-subproject when generating build files, which can cause all sorts of random, hard-to-diagnose issues. --- CMakeLists.txt | 4 ++-- src/platform/qt/CMakeLists.txt | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c75114dc3..ba6da81f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.6) -project(mGBA C) +cmake_minimum_required(VERSION 2.8.11) +project(mGBA) set(BINARY_NAME mgba CACHE INTERNAL "Name of output binaries") if(NOT MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-missing-field-initializers -std=c99") diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 3c1d7e665..b46a83a77 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -1,6 +1,3 @@ -cmake_minimum_required(VERSION 2.8.11) -enable_language(CXX) - if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif()