Weekly build fixes (#22699)
* CI: use CMAKE_ARGS for weekly builds. * CI: set CC and CXX for windows weekly build. * CMake: add OCCT libraries path to CMakePresets.json. * CI: synchronize CMake config for weekly-build with FreeCAD-Bundle. * CI: fix path to OCCT in weekly-builds. --------- Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
This commit is contained in:
@@ -149,6 +149,10 @@
|
||||
"OCC_INCLUDE_DIR": {
|
||||
"type": "FILEPATH",
|
||||
"value": "$env{CONDA_PREFIX}/include/opencascade"
|
||||
},
|
||||
"OCC_LIBRARY_DIR": {
|
||||
"type": "FILEPATH",
|
||||
"value": "$env{CONDA_PREFIX}/lib"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -176,6 +180,10 @@
|
||||
"OCC_INCLUDE_DIR": {
|
||||
"type": "FILEPATH",
|
||||
"value": "$env{CONDA_PREFIX}/include/opencascade"
|
||||
},
|
||||
"OCC_LIBRARY_DIR": {
|
||||
"type": "FILEPATH",
|
||||
"value": "$env{CONDA_PREFIX}/lib"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -199,6 +207,10 @@
|
||||
"OCC_INCLUDE_DIR": {
|
||||
"type": "FILEPATH",
|
||||
"value": "$env{CONDA_PREFIX}/Library/include/opencascade"
|
||||
},
|
||||
"OCC_LIBRARY_DIR": {
|
||||
"type": "FILEPATH",
|
||||
"value": "$env{CONDA_PREFIX}/Library/lib"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -12,20 +12,25 @@ set "CMAKE_GENERATOR="
|
||||
set "CMAKE_GENERATOR_PLATFORM="
|
||||
|
||||
cmake ^
|
||||
%CMAKE_ARGS% ^
|
||||
--preset conda-windows-release ^
|
||||
-D CMAKE_C_COMPILER:STRING="%CC%" ^
|
||||
-D CMAKE_CXX_COMPILER:STRING="%CXX%" ^
|
||||
-D CMAKE_INCLUDE_PATH:FILEPATH="%LIBRARY_PREFIX%/include" ^
|
||||
-D CMAKE_INSTALL_LIBDIR:FILEPATH="%LIBRARY_PREFIX%/lib" ^
|
||||
-D CMAKE_INSTALL_PREFIX:FILEPATH="%LIBRARY_PREFIX%" ^
|
||||
-D CMAKE_LIBRARY_PATH:FILEPATH="%LIBRARY_PREFIX%/lib" ^
|
||||
-D CMAKE_PREFIX_PATH:FILEPATH="%LIBRARY_PREFIX%" ^
|
||||
-D FREECAD_USE_EXTERNAL_FMT:BOOL=OFF ^
|
||||
-D INSTALL_TO_SITEPACKAGES:BOOL=ON ^
|
||||
-D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%/include" ^
|
||||
-D OCCT_CMAKE_FALLBACK:BOOL=OFF ^
|
||||
-D OCC_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%/include/opencascade" ^
|
||||
-D OCC_LIBRARY_DIR:FILEPATH="%LIBRARY_PREFIX%/lib" ^
|
||||
-D Python_EXECUTABLE:FILEPATH="%PYTHON%" ^
|
||||
-D Python3_EXECUTABLE:FILEPATH="%PYTHON%" ^
|
||||
-D SMESH_INCLUDE_DIR:FILEPATH="%LIBRARY_PREFIX%/include/smesh" ^
|
||||
-D SMESH_LIBRARY:FILEPATH="%LIBRARY_PREFIX%/lib/SMESH.lib" ^
|
||||
-B build ^
|
||||
-S . ^
|
||||
${CMAKE_PLATFORM_FLAGS[@]}
|
||||
-S .
|
||||
if %ERRORLEVEL% neq 0 exit 1
|
||||
|
||||
ninja -C build install
|
||||
|
||||
@@ -23,6 +23,7 @@ unset CMAKE_GENERATOR
|
||||
unset CMAKE_GENERATOR_PLATFORM
|
||||
|
||||
cmake \
|
||||
${CMAKE_ARGS} \
|
||||
--preset ${CMAKE_PRESET} \
|
||||
-D CMAKE_IGNORE_PREFIX_PATH="/opt/homebrew;/usr/local/homebrew" \
|
||||
-D CMAKE_INCLUDE_PATH:FILEPATH="$PREFIX/include" \
|
||||
@@ -30,14 +31,14 @@ cmake \
|
||||
-D CMAKE_INSTALL_PREFIX:FILEPATH="$PREFIX" \
|
||||
-D CMAKE_LIBRARY_PATH:FILEPATH="$PREFIX/lib" \
|
||||
-D CMAKE_PREFIX_PATH:FILEPATH="$PREFIX" \
|
||||
-D FREECAD_USE_EXTERNAL_FMT:BOOL=OFF \
|
||||
-D INSTALL_TO_SITEPACKAGES:BOOL=ON \
|
||||
-D OCC_INCLUDE_DIR:FILEPATH="$PREFIX/include" \
|
||||
-D OCCT_CMAKE_FALLBACK:BOOL=OFF \
|
||||
-D OCC_INCLUDE_DIR:FILEPATH="$PREFIX/include/opencascade" \
|
||||
-D OCC_LIBRARY_DIR:FILEPATH="$PREFIX/lib" \
|
||||
-D Python_EXECUTABLE:FILEPATH="$PYTHON" \
|
||||
-D Python3_EXECUTABLE:FILEPATH="$PYTHON" \
|
||||
-B build \
|
||||
-S . \
|
||||
${CMAKE_PLATFORM_FLAGS[@]}
|
||||
-S .
|
||||
|
||||
cmake --build build
|
||||
cmake --install build
|
||||
|
||||
Reference in New Issue
Block a user