Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Force using boost::filesystem when building for Android (#964) 

Co-authored-by: Rafał Bugajewski <rb@cocobit.software>
This commit is contained in:
Martin Chang 2021-08-09 22:37:23 +08:00 committed by GitHub
parent 477c3dca7d
commit b1bdc747c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
CMakeLists.txt
View File

@ -129,17 +129,16 @@ else (NOT WIN32)
target_link_libraries(${PROJECT_NAME} PRIVATE shlwapi) target_link_libraries(${PROJECT_NAME} PRIVATE shlwapi)
endif (NOT WIN32) endif (NOT WIN32)
set(NEED_BOOST_FS 0)
if (DROGON_CXX_STANDARD EQUAL 14) if (DROGON_CXX_STANDARD EQUAL 14)
# With C++14, use Boost to support any and string_view # With C++14, use Boost to support any and string_view
message(STATUS "use c++14") message(STATUS "use c++14")
find_package(Boost 1.61.0 REQUIRED) find_package(Boost 1.61.0 REQUIRED)
find_package(Boost 1.61.0 REQUIRED COMPONENTS filesystem) message(STATUS "Using Boost filesystem, string_view and any")
message(STATUS "Using Boost filesytem, string_view and any")
message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIR}) message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIR})
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::boost) target_link_libraries(${PROJECT_NAME} PUBLIC Boost::boost)
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::filesystem)
list(APPEND INCLUDE_DIRS_FOR_DYNAMIC_VIEW ${Boost_INCLUDE_DIR}) list(APPEND INCLUDE_DIRS_FOR_DYNAMIC_VIEW ${Boost_INCLUDE_DIR})
option(HAS_STD_FILESYSTEM_PATH "use boost::filesystem" OFF) set(NEED_BOOST_FS 1)
elseif (DROGON_CXX_STANDARD EQUAL 17) elseif (DROGON_CXX_STANDARD EQUAL 17)
# With C++17, use Boost if std::filesystem::path is missing # With C++17, use Boost if std::filesystem::path is missing
message(STATUS "use c++17") message(STATUS "use c++17")
@ -149,27 +148,41 @@ elseif (DROGON_CXX_STANDARD EQUAL 17)
${PROJECT_SOURCE_DIR}/cmake/tests/check_has_std_filesystem_path.cc ${PROJECT_SOURCE_DIR}/cmake/tests/check_has_std_filesystem_path.cc
CXX_STANDARD 17) CXX_STANDARD 17)
set(CMAKE_TRY_COMPILE_TARGET_TYPE) set(CMAKE_TRY_COMPILE_TARGET_TYPE)
if (check_filesystem_path) # Workaround: 2021-08-09 Android NDK does not provide proper std::filesystem
# support. Force boost::filesystem instead.
if (check_filesystem_path AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android")
message(STATUS "Using c++17 filesytem::path") message(STATUS "Using c++17 filesytem::path")
if (CMAKE_CXX_COMPILER_ID MATCHES GNU) if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
target_link_libraries(${PROJECT_NAME} PUBLIC stdc++fs) target_link_libraries(${PROJECT_NAME} PUBLIC stdc++fs)
endif() endif()
option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON) option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON)
else() else()
find_package(Boost 1.49.0 COMPONENTS filesystem system REQUIRED) message(STATUS "WORKAROUND: Forcing boost::filesystem on Android")
message(STATUS "Using Boost filesytem::path") set(NEED_BOOST_FS 1)
message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIR})
include_directories(${BOOST_INCLUDE_DIRS})
message(STATUS "Boost libraries: " ${Boost_LIBRARIES})
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::filesystem Boost::system)
list(APPEND INCLUDE_DIRS_FOR_DYNAMIC_VIEW ${Boost_INCLUDE_DIR})
option(HAS_STD_FILESYSTEM_PATH "use boost::filesystem" OFF)
endif() endif()
else () else ()
message(STATUS "use c++20") message(STATUS "use c++20")
option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON) # Workaround: 2021-08-09 Android NDK does not provide proper std::filesystem
# support. Force boost::filesystem instead.
if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android")
option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON)
else ()
message(STATUS "WORKAROUND: Forcing boost::filesystem on Android")
set(NEED_BOOST_FS 1)
endif ()
endif () endif ()
if(NEED_BOOST_FS)
find_package(Boost 1.49.0 COMPONENTS filesystem system REQUIRED)
message(STATUS "Using Boost filesytem::path")
message(STATUS "Boost include dir: " ${Boost_INCLUDE_DIR})
include_directories(${BOOST_INCLUDE_DIRS})
message(STATUS "Boost libraries: " ${Boost_LIBRARIES})
target_link_libraries(${PROJECT_NAME} PUBLIC Boost::filesystem Boost::system)
list(APPEND INCLUDE_DIRS_FOR_DYNAMIC_VIEW ${Boost_INCLUDE_DIR})
option(HAS_STD_FILESYSTEM_PATH "use boost::filesystem" OFF)
endif()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules/) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules/)
# jsoncpp # jsoncpp