Skip to content
Snippets Groups Projects
Commit 7d6f64cf authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

Merge branch 'macOSFixes-master-20200924' into 'master'

macOS Fixes, master branch (2020.09.25.)

See merge request atlas/atlasexternals!737
parents 9587f75c f0788edc
No related branches found
No related tags found
No related merge requests found
......@@ -45,6 +45,8 @@ ExternalProject_Add( HDF5
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
-DHDF5_BUILD_CPP_LIB:BOOL=ON
-DHDF5_BUILD_EXAMPLES:BOOL=OFF
-DHDF5_DISABLE_COMPILER_WARNINGS:BOOL=TRUE
-DBUILD_SHARED_LIBS:BOOL=ON
-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON
-DZLIB_LIBRARY:FILEPATH=${_zlibLibrary}
......
......@@ -6,6 +6,8 @@
@CMAKE_BINARY_DIR@@CMAKE_FILES_DIRECTORY@/atlas_build_run.sh @CMAKE_COMMAND@ \
-DCMAKE_INSTALL_PREFIX:PATH=@_buildDir@ \
-DCMAKE_IGNORE_PATH:STRING="/opt/local/bin;/opt/local/lib;/opt/local/include" \
-DPython3_FIND_STRATEGY:STRING="LOCATION" \
-DPython3_FIND_FRAMEWORK:STRING="LAST" \
-Dbuiltin_gsl:BOOL=ON -Dtmva-cpu:BOOL=OFF \
-Dbuiltin_freetype:BOOL=ON -Dbuiltin_lzma:BOOL=ON -Dbuiltin_veccore:BOOL=ON \
-Dbuiltin_lz4:BOOL=ON -Dbuiltin_glew:BOOL=ON -Dbuiltin_veccore:BOOL=ON \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment