From 985fe7fe4848f89c85bb828facedd8948333ea12 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Tue, 22 Oct 2019 12:00:50 +1100 Subject: [PATCH] cxx: disable filesystem library discovery --- nc_cxx.cmake | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/nc_cxx.cmake b/nc_cxx.cmake index 6549cd7..eb2164c 100644 --- a/nc_cxx.cmake +++ b/nc_cxx.cmake @@ -40,29 +40,29 @@ append_compile_flag ("-stdlib=libc++") # hardcoded guess and doesn't respect _all_ the system paths; specifically # something like /usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/libstdc++.so won't get # discovered. -if (NOT DEFINED __nc_cxx_stdcxxfs) - foreach(lib "" "c++fs" "c++experimental" "stdc++fs") - message (STATUS "Trying c++fs library '${lib}'") - try_compile( - __nc_cxx_stdcxxfs ${CMAKE_CURRENT_BINARY_DIR} - SOURCES - ${NC_CMAKE_BASE}/nc_cxx_stdcxxfs.cpp - LINK_LIBRARIES - ${lib} - ) - - if (__nc_cxx_stdcxxfs) - set (__nc_cxx_stdcxxfs "${lib}" CACHE INTERNAL "library required for c++ filesystem") - break () - endif () - endforeach() - - if (NOT DEFINED __nc_cxx_stdcxxfs) - message (FATAL_ERROR "Could not locate the required c++fs library") - endif () - - message (STATUS "Using c++fs library ${__nc_cxx_stdcxxfs}") -endif () +#if (NOT DEFINED __nc_cxx_stdcxxfs) +# foreach(lib "" "c++fs" "c++experimental" "stdc++fs") +# message (STATUS "Trying c++fs library '${lib}'") +# try_compile( +# __nc_cxx_stdcxxfs ${CMAKE_CURRENT_BINARY_DIR} +# SOURCES +# ${NC_CMAKE_BASE}/nc_cxx_stdcxxfs.cpp +# LINK_LIBRARIES +# ${lib} +# ) +# +# if (__nc_cxx_stdcxxfs) +# set (__nc_cxx_stdcxxfs "${lib}" CACHE INTERNAL "library required for c++ filesystem") +# break () +# endif () +# endforeach() +# +# if (NOT DEFINED __nc_cxx_stdcxxfs) +# message (FATAL_ERROR "Could not locate the required c++fs library") +# endif () +# +# message (STATUS "Using c++fs library ${__nc_cxx_stdcxxfs}") +#endif () set(NC_CXX_STDCXXFS ${__nc_cxx_stdcxxfs})