Merge branch 'develop' of https://github.com/cnjinhao/nana into develop

This commit is contained in:
Jinhao 2020-04-07 05:51:10 +08:00
commit bc7dc83473

View File

@ -53,7 +53,7 @@ else()
if(NANA_CMAKE_STD_FILESYSTEM_FORCE) if(NANA_CMAKE_STD_FILESYSTEM_FORCE)
target_compile_definitions(nana PUBLIC STD_FILESYSTEM_FORCE) target_compile_definitions(nana PUBLIC STD_FILESYSTEM_FORCE)
endif() endif()
include (CheckIncludeFileCXX)
check_include_file_cxx (filesystem NANA_HAVE_FILESYSTEM) check_include_file_cxx (filesystem NANA_HAVE_FILESYSTEM)
if (NANA_HAVE_FILESYSTEM) if (NANA_HAVE_FILESYSTEM)
message (STATUS "C++ Filesystem header: <filesystem>") message (STATUS "C++ Filesystem header: <filesystem>")
@ -87,7 +87,6 @@ else()
if (TEST_FS_LIB) if (TEST_FS_LIB)
include (FindPackageMessage) include (FindPackageMessage)
include (CheckIncludeFileCXX)
include (CheckCXXSourceCompiles) include (CheckCXXSourceCompiles)
# CMAKE_REQUIRED_FLAGS = string of compile command line flags # CMAKE_REQUIRED_FLAGS = string of compile command line flags
# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar) # CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)