diff --git a/INSTALL_MACOS.md b/INSTALL_MACOS.md index 61ceef9fb8..fda193782b 100644 --- a/INSTALL_MACOS.md +++ b/INSTALL_MACOS.md @@ -355,32 +355,29 @@ config.pri: # copy and paste the following in a terminal cat > config.pri << EOF boost { - BOOST_VERSION = \$\$system("ls /opt/local/libexec/boost|sort|tail -1") - message("found boost \$\$BOOST_VERSION") - INCLUDEPATH += /opt/local/libexec/boost/\$\$BOOST_VERSION/include - LIBS += -L/opt/local/libexec/boost/\$\$BOOST_VERSION/lib -lboost_serialization-mt + LIBS += -lboost_serialization-mt } macx:openmp { - QMAKE_CC=/opt/local/bin/clang-mp-9.0 - QMAKE_CXX=/opt/local/bin/clang++-mp-9.0 - QMAKE_OBJECTIVE_CC=\$\$QMAKE_CC -stdlib=libc++ + QMAKE_CC=/opt/local/bin/clang-mp-12 + QMAKE_CXX=/opt/local/bin/clang++-mp-12 + QMAKE_OBJECTIVE_CC=$$QMAKE_CC -stdlib=libc++ QMAKE_LINK=\$\$QMAKE_CXX - INCLUDEPATH += /opt/local/include/libomp - LIBS += -L/opt/local/lib/libomp -liomp5 + INCLUDEPATH += /opt/local/include /opt/local/include/libomp + LIBS += -L/opt/local/lib -L/opt/local/lib/libomp -liomp5 cc_setting.name = CC - cc_setting.value = /opt/local/bin/clang-mp-9.0 + cc_setting.value = \$\$QMAKE_CC cxx_setting.name = CXX - cxx_setting.value = /opt/local/bin/clang++-mp-9.0 + cxx_setting.value = \$\$QMAKE_CXX ld_setting.name = LD - ld_setting.value = /opt/local/bin/clang-mp-9.0 + ld_setting.value = \$\$QMAKE_CC ldplusplus_setting.name = LDPLUSPLUS - ldplusplus_setting.value = /opt/local/bin/clang++-mp-7.0 + ldplusplus_setting.value = \$\$QMAKE_CXX QMAKE_MAC_XCODE_SETTINGS += cc_setting cxx_setting ld_setting ldplusplus_setting QMAKE_FLAGS = "-B /usr/bin" - # clang (as of 5.0) does not yet support index-while-building functionality - # present in Xcode 9, and Xcode 9's clang does not yet support OpenMP + # clang (as of 12.0.1) does not yet support index-while-building functionality + # present in Xcode 9 and later, and Xcode's clang (as of 13.0) does not yet support OpenMP compiler_index_store_enable_setting.name = COMPILER_INDEX_STORE_ENABLE compiler_index_store_enable_setting.value = NO QMAKE_MAC_XCODE_SETTINGS += compiler_index_store_enable_setting diff --git a/config-homebrew.pri b/config-homebrew.pri new file mode 100644 index 0000000000..8028e108fe --- /dev/null +++ b/config-homebrew.pri @@ -0,0 +1,32 @@ +boost: INCLUDEPATH += /usr/local/include +boost: LIBS += -L/usr/local/lib -lboost_serialization-mt -lboost_thread-mt -lboost_system-mt +expat: PKGCONFIG -= expat +expat: INCLUDEPATH += /usr/local/opt/expat/include +expat: LIBS += -L/usr/local/opt/expat/lib -lexpat +openmp { + LIBS += -L/usr/local/opt/llvm@11/lib -lomp + + cc_setting.name = CC + cc_setting.value = /usr/local/opt/llvm@11/bin/clang + cxx_setting.name = CXX + cxx_setting.value = /usr/local/opt/llvm@11/bin/clang++ + ld_setting.name = LD + ld_setting.value = /usr/local/opt/llvm@11/bin/clang + ldxx_setting.name = LDPLUSPLUS + ldxx_setting.value = /usr/local/opt/llvm@11/bin/clang++ + QMAKE_MAC_XCODE_SETTINGS += cc_setting cxx_setting ld_setting ldxx_setting + QMAKE_FLAGS = "-B /usr/bin" + + # clang (as of 5.0) does not yet support index-while-building functionality + # present in Xcode 9, and Xcode 9's clang does not yet support OpenMP + compiler_index_store_enable_setting.name = COMPILER_INDEX_STORE_ENABLE + compiler_index_store_enable_setting.value = NO + QMAKE_MAC_XCODE_SETTINGS += compiler_index_store_enable_setting + + # Xcode 9 compiles for 10.13 by default +# sdkroot_setting.name = SDKROOT +# sdkroot_setting.value = macosx10.14 +# QMAKE_MAC_XCODE_SETTINGS += sdkroot_setting +} +#expat: INCLUDEPATH += /Users/devernay/Development/openfx/HostSupport/expat-2.1.0/lib +#expat: LIBS += /Users/devernay/Development/openfx/HostSupport/Darwin-debug diff --git a/config-macports.pri b/config-macports.pri index 8393d1d922..0ac0754fb7 100644 --- a/config-macports.pri +++ b/config-macports.pri @@ -1,30 +1,27 @@ boost { - BOOST_VERSION = $$system("grep 'default boost.version' /opt/local/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/boost-1.0.tcl |awk '{ print $3 }'") - message("found boost $$BOOST_VERSION") - INCLUDEPATH += /opt/local/libexec/boost/$$BOOST_VERSION/include - LIBS += -L/opt/local/libexec/boost/$$BOOST_VERSION/lib -lboost_serialization-mt + LIBS += -lboost_serialization-mt } macx:openmp { - QMAKE_CC=/opt/local/bin/clang-mp-9.0 - QMAKE_CXX=/opt/local/bin/clang++-mp-9.0 + QMAKE_CC=/opt/local/bin/clang-mp-12 + QMAKE_CXX=/opt/local/bin/clang++-mp-12 QMAKE_OBJECTIVE_CC=$$QMAKE_CC -stdlib=libc++ QMAKE_LINK=$$QMAKE_CXX - INCLUDEPATH += /opt/local/include/libomp - LIBS += -L/opt/local/lib/libomp -liomp5 + INCLUDEPATH += /opt/local/include /opt/local/include/libomp + LIBS += -L/opt/local/lib -L/opt/local/lib/libomp -liomp5 cc_setting.name = CC - cc_setting.value = /opt/local/bin/clang-mp-9.0 + cc_setting.value = $$QMAKE_CC cxx_setting.name = CXX - cxx_setting.value = /opt/local/bin/clang++-mp-9.0 + cxx_setting.value = $$QMAKE_CXX ld_setting.name = LD - ld_setting.value = /opt/local/bin/clang-mp-9.0 + ld_setting.value = $$QMAKE_CC ldplusplus_setting.name = LDPLUSPLUS - ldplusplus_setting.value = /opt/local/bin/clang++-mp-7.0 + ldplusplus_setting.value = $$QMAKE_CXX QMAKE_MAC_XCODE_SETTINGS += cc_setting cxx_setting ld_setting ldplusplus_setting QMAKE_FLAGS = "-B /usr/bin" - # clang (as of 5.0) does not yet support index-while-building functionality - # present in Xcode 9, and Xcode 9's clang does not yet support OpenMP + # clang (as of 12.0.1) does not yet support index-while-building functionality + # present in Xcode 9 and later, and Xcode's clang (as of 13.0) does not yet support OpenMP compiler_index_store_enable_setting.name = COMPILER_INDEX_STORE_ENABLE compiler_index_store_enable_setting.value = NO QMAKE_MAC_XCODE_SETTINGS += compiler_index_store_enable_setting