@@ -207,8 +207,8 @@ runs:
207207 -D OpenCASCADE_DIR=$HOME/opt/local/occt-${{ env.OCCT }}-${{ inputs.use-vtk }}/lib/cmake/opencascade \
208208 -D pybind11_DIR=$(python -c "import pybind11; print(pybind11.get_cmake_dir())") \
209209 -D CMAKE_CXX_STANDARD=17 \
210- -D CMAKE_CXX_FLAGS="-isystem $CONDA_PREFIX/include -isystem $CONDA_PREFIX/include/python${{ inputs.python-version }} -D_GLIBCXX_USE_CXX11_ABI=$CXX11_ABI -fvisibility=hidden -w" \
211- -D CMAKE_MODULE_LINKER_FLAGS="-L $CONDA_PREFIX/lib -L $HOME/opt/local/vtk-${{ env.VTK }}/lib -Wl,--no-as-needed -lfmt -Wl,--as-needed " \
210+ -D CMAKE_CXX_FLAGS="-isystem $CONDA_PREFIX/include -isystem $CONDA_PREFIX/include/python${{ inputs.python-version }} -D_GLIBCXX_USE_CXX11_ABI=$CXX11_ABI -DFMT_HEADER_ONLY - fvisibility=hidden -w" \
211+ -D CMAKE_MODULE_LINKER_FLAGS="-L $CONDA_PREFIX/lib -L $HOME/opt/local/vtk-${{ env.VTK }}/lib" \
212212 -D CMAKE_BUILD_WITH_INSTALL_RPATH=TRUE
213213
214214 if [[ "${{ inputs.use-vtk }}" == "vtk" ]]; then
@@ -236,11 +236,10 @@ runs:
236236 cd OCP
237237
238238 if [[ "${{ inputs.use-vtk }}" == "vtk" ]]; then
239+ export LDFLAGS="-L$HOME/opt/local/vtk-${{ env.VTK }}/lib"
239240 VTK_DIR="-D VTK_DIR=$HOME/opt/local/vtk-${{ env.VTK }}"
240- FMT_LINKER_FLAGS="-L $CONDA_PREFIX/lib -L $HOME/opt/local/vtk-${{ env.VTK }}/lib -lfmt"
241241 else
242242 VTK_DIR=""
243- FMT_LINKER_FLAGS="-L $CONDA_PREFIX/lib -lfmt"
244243 fi
245244
246245 echo "Building OCP with VTK_DIR=$VTK_DIR"
@@ -249,8 +248,7 @@ runs:
249248 -D CMAKE_C_COMPILER=/usr/bin/clang -D CMAKE_CXX_COMPILER=/usr/bin/clang++ \
250249 -D CMAKE_BUILD_TYPE=Release \
251250 -D CMAKE_OSX_DEPLOYMENT_TARGET="11.1" \
252- -D CMAKE_CXX_FLAGS="-isystem $CONDA_PREFIX/include -isystem $CONDA_PREFIX/include/python${{ inputs.python-version }} -fvisibility=hidden -w" \
253- -D CMAKE_MODULE_LINKER_FLAGS="$FMT_LINKER_FLAGS" \
251+ -D CMAKE_CXX_FLAGS="-isystem $CONDA_PREFIX/include -isystem $CONDA_PREFIX/include/python${{ inputs.python-version }} -DFMT_HEADER_ONLY -fvisibility=hidden -w" \
254252 $VTK_DIR \
255253 -D OpenCASCADE_DIR=$HOME/opt/local/occt-${{ env.OCCT }}-${{ inputs.use-vtk }}/lib/cmake/opencascade \
256254 -D pybind11_DIR=$(python -c "import pybind11; print(pybind11.get_cmake_dir())") \
@@ -302,13 +300,12 @@ runs:
302300
303301 cmake -B build -S OCP -G Ninja ^
304302 -D CMAKE_BUILD_TYPE=Release ^
305- -D CMAKE_CXX_FLAGS="/DWIN32 /D_WINDOWS /GR /EHsc /utf-8 /wd4834 /wd4996 /external:I%CONDA_PREFIX%\Include /external:I%CONDA_PREFIX%\Library\include /external:I%CONDA_PREFIX%\Lib\site-packages\pybind11\include" ^
303+ -D CMAKE_CXX_FLAGS="/DWIN32 /D_WINDOWS /GR /EHsc /utf-8 /DFMT_HEADER_ONLY / wd4834 /wd4996 /external:I%CONDA_PREFIX%\Include /external:I%CONDA_PREFIX%\Library\include /external:I%CONDA_PREFIX%\Lib\site-packages\pybind11\include" ^
306304 -D Python3_FIND_STRATEGY=LOCATION ^
307305 -D Python3_ROOT_DIR=%CONDA_PREFIX% ^
308306 %VTK_DIR% ^
309307 -D OpenCASCADE_DIR=%USERPROFILE%\opt\local\occt-${{ env.OCCT }}-${{ inputs.use-vtk }}\cmake ^
310- -D pybind11_DIR=%CONDA_PREFIX%\Lib\site-packages\pybind11\share\cmake\pybind11 ^
311- -D CMAKE_MODULE_LINKER_FLAGS="/LIBPATH:%CONDA_PREFIX%\Library\lib fmt.lib"
308+ -D pybind11_DIR=%CONDA_PREFIX%\Lib\site-packages\pybind11\share\cmake\pybind11
312309
313310 ninja -C build -j ${{ steps.cpu-count.outputs.cpu_count }}
314311
@@ -374,15 +371,15 @@ runs:
374371 mv *.pyd OCP
375372
376373 elif [[ "$RUNNER_OS" == "macOS" ]]; then
377- DYLD_LIBRARY_PATH=$HOME/opt/local/vtk-${{ env.VTK }}/lib:$HOME/opt/local/occt-${{ env.OCCT }}-${{ inputs.use-vtk }}/lib:$CONDA_PREFIX/lib \
374+ DYLD_LIBRARY_PATH=$HOME/opt/local/vtk-${{ env.VTK }}/lib:$HOME/opt/local/occt-${{ env.OCCT }}-${{ inputs.use-vtk }}/lib \
378375 python ocp-tree.py
379376 mv *.so OCP
380377 ls -l OCP/*.so
381378 strip -x OCP/*.so
382379 ls -l OCP/*.so
383380
384381 else
385- LD_LIBRARY_PATH=$HOME/opt/local/vtk-${{ env.VTK }}/lib:$HOME/opt/local/occt-${{ env.OCCT }}-${{ inputs.use-vtk }}/lib:$CONDA_PREFIX/lib \
382+ LD_LIBRARY_PATH=$HOME/opt/local/vtk-${{ env.VTK }}/lib:$HOME/opt/local/occt-${{ env.OCCT }}-${{ inputs.use-vtk }}/lib \
386383 python ocp-tree.py
387384 mv *.so OCP
388385 ls -l OCP/*.so
0 commit comments