InputCommon: Fix libusb include directory.

Merge pull request #4318 from lioncash/cpp20
CMakeLists: Enable usage of C++20 on Linux
2020-07-13 17:27:08 +02:00 · 2020-07-12 19:39:09 -03:00 · 2020-07-12 18:15:29 -04:00
2 changed files with 4 additions and 3 deletions
@@ -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()

@@ -30,6 +30,7 @@ if(SDL2_FOUND)
    target_compile_definitions(input_common PRIVATE HAVE_SDL2)
 endif()

+target_include_directories(input_common PUBLIC ${LIBUSB_INCLUDE_DIR})
 target_link_libraries(input_common PUBLIC ${LIBUSB_LIBRARIES})

 create_target_directory_groups(input_common)
Author	SHA1	Message	Date
Markus Wick	e8ca7da64e	InputCommon: Fix libusb include directory.	2020-07-13 17:27:08 +02:00
Rodrigo Locatti	f1d8c83e1c	Merge pull request #4318 from lioncash/cpp20 CMakeLists: Enable usage of C++20 on Linux	2020-07-12 19:39:09 -03:00
Lioncash	07632ad825	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.	2020-07-12 18:15:29 -04:00