From 99d8d0bc635b433c2b6ea5476c54dd7758d95e98 Mon Sep 17 00:00:00 2001 From: Mark Roszko Date: Fri, 3 May 2024 02:15:52 +0000 Subject: [PATCH] Use the new kmb toolchain file for vars (cherry picked from commit f00a1ab517eee4adaba3864eb5cfcaa5358085df) Co-authored-by: Mark Roszko --- .gitlab/macOS-CI.yml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.gitlab/macOS-CI.yml b/.gitlab/macOS-CI.yml index b423630e91..27df94e635 100644 --- a/.gitlab/macOS-CI.yml +++ b/.gitlab/macOS-CI.yml @@ -15,25 +15,7 @@ macos_build: - cd build/macos - cmake -G Ninja - -DCMAKE_BUILD_TYPE=RelWithDebInfo - -DDEFAULT_INSTALL_PATH=/Library/Application\ Support /kicad - -DOCC_INCLUDE_DIR=/opt/homebrew/Cellar/opencascade/7.7.2_2/include/opencascade - -DOCC_LIBRARY_DIR=/opt/homebrew/Cellar/opencascade/7.7.2_2/Lib - -DCMAKE_INSTALL_PREFIX=/Users/ci/kicad-mac-builder/build/kicad-dest - -DCMAKE_C_COMPILER=/usr/bin/clang - -DCMAKE_CXX_COMPILER=/usr/bin/clang++ - -DwxWidgets_CONFIG_EXECUTABLE=/Users/ci/kicad-mac-builder/build/wxwidgets-dest/bin/wx-config - -DKICAD_BUILD_I18N=ON - -DKICAD_SCRIPTING_WXPYTHON=ON - -DKICAD_BUILD_PNS_DEBUG_TOOL=ON - -DPYTHON_EXECUTABLE=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/bin/python3 - -DPYTHON_INCLUDE_DIR=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/include/python3.9/ - -DPYTHON_LIBRARY=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/lib/libpython3.9.dylib - -DPYTHON_SITE_PACKAGE_PATH=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework/Versions/Current/lib/python3.9/site-packages - -DPYTHON_FRAMEWORK=/Users/ci/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework - -DNGSPICE_INCLUDE_DIR=/Users/ci/kicad-mac-builder/build/ngspice-dest/include - -DNGSPICE_LIBRARY=/Users/ci/kicad-mac-builder/build/ngspice-dest/lib/libngspice.dylib - -DKICAD_USE_3DCONNEXION=ON + -DCMAKE_TOOLCHAIN_FILE=/Users/ci/kicad-mac-builder/toolchain/kicad-mac-builder.cmake ../../ - cmake --build . 2>&1 | tee compilation_log.txt - cd ../../