mirror of
https://github.com/mikage-emu/mikage-dev.git
synced 2025-02-08 21:38:27 +01:00
CMake: Prefer Conan-provided packages over system ones
This commit is contained in:
parent
d541fad7b7
commit
b4df51b519
1 changed files with 6 additions and 7 deletions
|
@ -1,6 +1,7 @@
|
||||||
# 3.11 added support for interface libraries
|
# 3.11 added support for interface libraries
|
||||||
# 3.13 detects and target-izes all of our boost dependencies properly
|
# 3.13 detects and target-izes all of our boost dependencies properly
|
||||||
cmake_minimum_required(VERSION 3.13)
|
# 3.15 added CMAKE_FIND_PACKAGE_PREFER_CONFIG
|
||||||
|
cmake_minimum_required(VERSION 3.15)
|
||||||
|
|
||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
|
|
||||||
|
@ -20,11 +21,12 @@ if (USE_ASAN)
|
||||||
add_link_options(-fsanitize=address)
|
add_link_options(-fsanitize=address)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/externals/cmake")
|
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
|
# Prefer Conan-provided packages over system ones
|
||||||
|
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG TRUE)
|
||||||
|
|
||||||
# TODO: Move these flags into a "boost" cmake target
|
# TODO: Move these flags into a "boost" cmake target
|
||||||
add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED -DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
|
add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED -DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
|
||||||
|
|
||||||
|
@ -36,10 +38,7 @@ add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED -DBOOST_COROUTINES_NO_DEPRECATI
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fstrict-aliasing -Wpedantic")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fstrict-aliasing -Wpedantic")
|
||||||
|
|
||||||
set(BOOST_COMPONENTS context filesystem iostreams program_options thread)
|
set(BOOST_COMPONENTS context filesystem iostreams program_options thread)
|
||||||
find_package(Boost 1.80.0 EXACT CONFIG COMPONENTS ${BOOST_COMPONENTS})
|
|
||||||
if (NOT Boost_FOUND)
|
|
||||||
find_package(Boost 1.80.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
|
find_package(Boost 1.80.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
|
||||||
endif ()
|
|
||||||
|
|
||||||
find_package(fmt REQUIRED)
|
find_package(fmt REQUIRED)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue