From b1b1ed7597cbe329e26db8240b9e05d3fc360b6f Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 1 Jul 2020 22:00:47 +0000 Subject: cmake: stop linking against QGL after c6a0ab979239 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 73405ce4b..2f1bc81ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,7 +213,7 @@ if(ENABLE_QT) set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") endif() - find_package(Qt5 5.9 COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) + find_package(Qt5 5.9 COMPONENTS Widgets ${QT_PREFIX_HINT}) if (YUZU_USE_QT_WEB_ENGINE) find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets) endif() @@ -289,7 +289,7 @@ if (CONAN_REQUIRED_LIBS) if(ENABLE_QT) list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}") list(APPEND CMAKE_PREFIX_PATH "${CONAN_QT_ROOT_RELEASE}") - find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets OpenGL) + find_package(Qt5 5.9 REQUIRED COMPONENTS Widgets) if (YUZU_USE_QT_WEB_ENGINE) find_package(Qt5 REQUIRED COMPONENTS WebEngineCore WebEngineWidgets) endif() -- cgit v1.2.3 From 48ff15602e89ee2b7946310dd343859d56795a67 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 9 Jul 2020 14:56:56 +0000 Subject: cmake: pass libusb include directory as well In file included from src/input_common/gcadapter/gc_adapter.cpp:8: src/./input_common/gcadapter/gc_adapter.h:11:10: fatal error: 'libusb.h' file not found #include ^~~~~~~~~~ --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index cd40e5cfe..eb51d09dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -333,6 +333,7 @@ endif() find_package(LibUSB) if (NOT LIBUSB_FOUND) add_subdirectory(externals/libusb) + set(LIBUSB_INCLUDE_DIR "") set(LIBUSB_LIBRARIES usb) endif() -- cgit v1.2.3 From 48aa076049f9c3ac05b32682027d48639cd72528 Mon Sep 17 00:00:00 2001 From: David Marcec Date: Fri, 10 Jul 2020 14:02:44 +1000 Subject: cmake: Fix libusb builds breaking --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index cd40e5cfe..4619f33f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,6 +330,7 @@ elseif(SDL2_FOUND) endif() # Ensure libusb is properly configured (based on dolphin libusb include) +INCLUDE(FindPkgConfig) find_package(LibUSB) if (NOT LIBUSB_FOUND) add_subdirectory(externals/libusb) -- cgit v1.2.3 From d39b4575665386c6889787edc985f85295dfe29d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 10 Jul 2020 01:18:37 -0400 Subject: CMakeLists: Use lower-case command names Our convention uses lower-case command names, so this is just a consistency change. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4619f33f4..a99d34e5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,7 +330,7 @@ elseif(SDL2_FOUND) endif() # Ensure libusb is properly configured (based on dolphin libusb include) -INCLUDE(FindPkgConfig) +include(FindPkgConfig) find_package(LibUSB) if (NOT LIBUSB_FOUND) add_subdirectory(externals/libusb) -- cgit v1.2.3 From 798c1b457d721962799f4e6f042ad4fe91b72386 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 10 Jul 2020 04:47:31 -0400 Subject: CMakeLists: Update fmt to 7.0.1 Keeps the package up to date with the latest major release of fmt. This version brings in quite a bit of improvements, such as code size reduction, etc. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4619f33f4..26299d103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,7 +151,7 @@ macro(yuzu_find_packages) # Cmake Pkg Prefix Version Conan Pkg "Boost 1.71 boost/1.72.0" "Catch2 2.11 catch2/2.11.0" - "fmt 6.2 fmt/6.2.0" + "fmt 7.0 fmt/7.0.1" # can't use until https://github.com/bincrafters/community/issues/1173 #"libzip 1.5 libzip/1.5.2@bincrafters/stable" "lz4 1.8 lz4/1.9.2" -- cgit v1.2.3 From fb0fefc75c3cb9e060d59f3b10fe3ae66626aeb8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 10 Jul 2020 19:24:23 -0400 Subject: CMakeLists: Make use of /std:c++latest on MSVC Provides the buildbot with one builder that is always tracking the latest version of the C++ standard, allowing us to progressively rectify our code and amend any differences between standards over time instead of waiting for a complete standard change, potentially breaking a lot of code all at once. --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c0e49c03..c8e86959b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,8 +118,15 @@ message(STATUS "Target architecture: ${ARCHITECTURE}") # Configure C++ standard # =========================== -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) +if (MSVC) + add_compile_options(/std:c++latest) + + # cubeb and boost still make use of deprecated result_of. + add_definitions(-D_HAS_DEPRECATED_RESULT_OF) +else() + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) +endif() # Output binaries to bin/ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) -- cgit v1.2.3 From 6744e7ea4a2e00ac2a481045f036a282b85fc0b1 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 11 Jul 2020 14:37:34 +0100 Subject: CMakeLists: Do not search for system libusb on macOS --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 1c0e49c03..88ea04c08 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -330,14 +330,15 @@ elseif(SDL2_FOUND) endif() # Ensure libusb is properly configured (based on dolphin libusb include) -include(FindPkgConfig) -find_package(LibUSB) +if(NOT APPLE) + include(FindPkgConfig) + find_package(LibUSB) +endif() if (NOT LIBUSB_FOUND) add_subdirectory(externals/libusb) set(LIBUSB_LIBRARIES usb) endif() - # Prefer the -pthread flag on Linux. set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -- cgit v1.2.3 From 539675b21a4e132a3826d5ee7385c8a980d558e5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 12 Jul 2020 15:53:29 -0400 Subject: CMakeLists: Disable concepts in boost asio --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 12c0a4284..174ed1c58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,6 +123,8 @@ if (MSVC) # cubeb and boost still make use of deprecated result_of. add_definitions(-D_HAS_DEPRECATED_RESULT_OF) + # boost asio's concept usage doesn't play nicely with MSVC yet. + add_definitions(-DASIO_DISABLE_CONCEPTS) else() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -- cgit v1.2.3 From b971b822756f14560d585bb7160ef864974783eb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 12 Jul 2020 17:17:48 -0400 Subject: CMakeLists: Correct boost asio disabling define name Previously the name of the define was missing the BOOST_ prefix. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 174ed1c58..99476c55f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,7 @@ if (MSVC) # cubeb and boost still make use of deprecated result_of. add_definitions(-D_HAS_DEPRECATED_RESULT_OF) # boost asio's concept usage doesn't play nicely with MSVC yet. - add_definitions(-DASIO_DISABLE_CONCEPTS) + add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS) else() set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -- cgit v1.2.3 From 07632ad825086a3910ed1690dad30c602d67c213 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 12 Jul 2020 18:15:27 -0400 Subject: CMakeLists: Enable usage of C++20 on Linux This also fixes building on Linux with C++20, so we can enable it across the board for all OSes that we officially support. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 99476c55f..a5357335f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,15 +118,15 @@ message(STATUS "Target architecture: ${ARCHITECTURE}") # Configure C++ standard # =========================== +# boost asio's concept usage doesn't play nicely with some compilers yet. +add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS) if (MSVC) add_compile_options(/std:c++latest) # cubeb and boost still make use of deprecated result_of. add_definitions(-D_HAS_DEPRECATED_RESULT_OF) - # boost asio's concept usage doesn't play nicely with MSVC yet. - add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS) else() - set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) endif() -- cgit v1.2.3