liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci macos: attempt to fix linking issues

Browse Source
This commit is contained in:
Quinten Krijger
2019-12-07 16:16:49 +01:00
parent c4869d08d4
commit 4aad850267
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/main.yml vendored
View File

@@ -18,11 +18,13 @@ jobs:
PKG_CONFIG_PATH: /usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig PKG_CONFIG_PATH: /usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig
RAW_THERAPEE_MAJOR: '5' RAW_THERAPEE_MAJOR: '5'
RAW_THERAPEE_MINOR: '7' RAW_THERAPEE_MINOR: '7'
C_FLAGS: -Xpreprocessor -fopenmp /usr/local/Cellar/libomp/9.0.0/lib/libomp.dylib -I/usr/local/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/llvm/include
run: | run: |
mkdir build && cd build mkdir build && cd build
cmake \ cmake \
-DCMAKE_BUILD_TYPE="release" \ -DCMAKE_BUILD_TYPE="release" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DCMAKE_EXE_LINKER_FLAGS="-L/usr/local/opt/libffi/lib -L/usr/local/lib -L/usr/local/opt/libffi/lib -L/usr/local/opt/libxml2/lib -L/usr/local/opt/expat/lib -L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib" \
-DCACHE_NAME_SUFFIX="${RAW_THERAPEE_MAJOR}.${RAW_THERAPEE_MINOR}-${GITHUB_REF##*/}" \ -DCACHE_NAME_SUFFIX="${RAW_THERAPEE_MAJOR}.${RAW_THERAPEE_MINOR}-${GITHUB_REF##*/}" \
-DPROC_TARGET_NUMBER="2" \ -DPROC_TARGET_NUMBER="2" \
-DPROC_LABEL="generic processor" \ -DPROC_LABEL="generic processor" \
@@ -32,10 +34,9 @@ jobs:
-DOpenMP_CXX_FLAGS=-fopenmp=libomp \ -DOpenMP_CXX_FLAGS=-fopenmp=libomp \
-DOpenMP_C_LIB_NAMES="libomp" \ -DOpenMP_C_LIB_NAMES="libomp" \
-DOpenMP_CXX_LIB_NAMES="libomp" \ -DOpenMP_CXX_LIB_NAMES="libomp" \
-DOpenMP_libomp_LIBRARY="/usr/local/lib/libomp.dylib" \ -DOpenMP_libomp_LIBRARY="/usr/local/Cellar/libomp/9.0.0/lib/libomp.dylib" \
-DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include" \ -DOpenMP_C_FLAGS="${C_FLAGS}" \
-DOpenMP_CXX_LIB_NAMES="libomp" \ -DOpenMP_CXX_FLAGS="${C_FLAGS}" \
-DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include" \
.. ..
make --jobs 8 make --jobs 8
make install make install