ktyl
/
basalt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cmake updates

This commit is contained in:
Vladyslav Usenko 2020-04-16 16:18:21 +02:00
parent d1e5d470f9
commit f5118d15a2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -123,16 +123,18 @@ if(APPLE)
# See: https://github.com/openMVG/openMVG/issues/1349#issuecomment-401492811 # See: https://github.com/openMVG/openMVG/issues/1349#issuecomment-401492811
set(CMAKE_FIND_FRAMEWORK LAST) set(CMAKE_FIND_FRAMEWORK LAST)
if(CMAKE_SYSTEM_VERSION VERSION_LESS 18.0.0) if(CMAKE_SYSTEM_VERSION VERSION_LESS 19.0.0)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
# use brewed llvm's libc++ # use brewed llvm's libc++
include_directories("/usr/local/opt/llvm/include/c++/v1") #include_directories("/usr/local/opt/llvm/include/c++/v1")
link_directories("/usr/local/opt/llvm/lib") #link_directories("/usr/local/opt/llvm/lib")
add_compile_options("-nostdinc++") #add_compile_options("-nostdinc++")
set(STD_CXX_FS c++fs) #set(STD_CXX_FS c++fs)
# Workaround for cmake not to filter the manually added standard include path # Workaround for cmake not to filter the manually added standard include path
# See: https://gitlab.kitware.com/cmake/cmake/issues/19227#note_669894 # See: https://gitlab.kitware.com/cmake/cmake/issues/19227#note_669894
list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/usr/local/opt/llvm/include/c++/v1") #list(REMOVE_ITEM CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/usr/local/opt/llvm/include/c++/v1")
endif() endif()
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")