mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't reuse variable!

Browse Source
This commit is contained in:
qPCR4vir 2019-11-06 11:00:19 +01:00
parent 5438b4ee28
commit 0e7261228c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/cmake/select_filesystem.cmake
View File

@ -60,7 +60,7 @@ else()
if (NANA_HAVE_FILESYSTEM) if (NANA_HAVE_FILESYSTEM)
message (STATUS "C++ Filesystem header: <filesystem>") message (STATUS "C++ Filesystem header: <filesystem>")
set (TEST_FS_LIB ON) set (TEST_FS_LIB ON)
set (CXXSTD_TEST_SOURCE set (CXXSTD_FS_TEST_SOURCE
"#include <filesystem> "#include <filesystem>
int main() int main()
{ {
@ -70,7 +70,7 @@ else()
elseif (NANA_HAVE_EXP_FILESYSTEM) elseif (NANA_HAVE_EXP_FILESYSTEM)
message (STATUS "C++ Filesystem header: <experimental/filesystem>") message (STATUS "C++ Filesystem header: <experimental/filesystem>")
set (TEST_FS_LIB ON) set (TEST_FS_LIB ON)
set (CXXSTD_TEST_SOURCE set (CXXSTD_FS_TEST_SOURCE
"#include <experimental/filesystem> "#include <experimental/filesystem>
int main() int main()
{ {
@ -78,7 +78,7 @@ else()
throw std::experimental::filesystem::filesystem_error(\"Empty file name!\", std::make_error_code(std::errc::invalid_argument)); throw std::experimental::filesystem::filesystem_error(\"Empty file name!\", std::make_error_code(std::errc::invalid_argument));
}") }")
else () else ()
message (WARNING "No std::filesystem found: nana::filesystem will be used. message (WARNING "No std::filesystem include file found: nana::filesystem will be used.
Set NANA_CMAKE_NANA_FILESYSTEM_FORCE to ON to avoid this warning.") Set NANA_CMAKE_NANA_FILESYSTEM_FORCE to ON to avoid this warning.")
target_compile_definitions(nana PUBLIC STD_FILESYSTEM_NOT_SUPPORTED) target_compile_definitions(nana PUBLIC STD_FILESYSTEM_NOT_SUPPORTED)
set (TEST_FS_LIB OFF) set (TEST_FS_LIB OFF)
@ -116,15 +116,15 @@ else()
endif () endif ()
set (CMAKE_REQUIRED_LIBRARIES_ORIGINAL ${CMAKE_REQUIRED_LIBRARIES}) set (CMAKE_REQUIRED_LIBRARIES_ORIGINAL ${CMAKE_REQUIRED_LIBRARIES})
check_cxx_source_compiles ("${CXXSTD_TEST_SOURCE}" C++17FS_BUILTIN) check_cxx_source_compiles ("${CXXSTD_TEST_SOURCE}" C++17FS_FLAG)
if (C++17FS_BUILTIN) if (C++17FS_FLAG)
message (STATUS "C++ Filesystem library: builtin") message (STATUS "C++ Filesystem library: builtin")
else () else ()
set (C++17FS_LIB "") set (C++17FS_LIB "")
foreach (_LIB stdc++fs) foreach (_LIB stdc++fs)
set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_ORIGINAL} ${_LIB}) set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_ORIGINAL} ${_LIB})
check_cxx_source_compiles ("${CXXSTD_TEST_SOURCE}" C++17FS_LIB-l${_LIB}) check_cxx_source_compiles ("${CXXSTD_FS_TEST_SOURCE}" C++17FS_LIB-l${_LIB})
message (STATUS "C++ Filesystem library: testing -l${_LIB}") message (STATUS "C++ Filesystem library: testing -l${_LIB}")
if (C++17FS_LIB-l${_LIB}) if (C++17FS_LIB-l${_LIB})
target_link_libraries (nana PUBLIC ${_LIB}) target_link_libraries (nana PUBLIC ${_LIB})