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

Small fixes for MacOS

This commit is contained in:
Vladyslav Usenko 2020-04-17 21:17:51 +02:00
parent f03df0da6c
commit 8225faedbd
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.10)
include("thirdparty/basalt-headers/cmake_modules/PreProjectWorkarounds.cmake") include("thirdparty/basalt-headers/cmake_modules/PreProjectWorkarounds.cmake")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
message(STATUS "... setting deployment target to '${CMAKE_OSX_DEPLOYMENT_TARGET}' to trick libc++ into not disabling some features (like std::visit)")
project(basalt) project(basalt)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/" ${CMAKE_MODULE_PATH})
@ -126,17 +123,17 @@ 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 19.0.0) if(CMAKE_SYSTEM_VERSION VERSION_LESS 19.0.0)
# 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")
message(STATUS "Detected macOS with non-Apple clang") message(STATUS "Detected macOS with non-Apple clang")

2
thirdparty/basalt-headers vendored

@ -1 +1 @@
Subproject commit c17b8d6ba96a2cdd0ade72e66dbb01bda455cbe9 Subproject commit 1395990144121427d6236444b1643b6fe068f736