Skip to content

Commit

Permalink
Merge branch 'main' into RELEASE
Browse files Browse the repository at this point in the history
  • Loading branch information
starseeker committed Jul 12, 2024
2 parents ffefe2f + 675de3d commit 6f3de9d
Show file tree
Hide file tree
Showing 101 changed files with 4,542 additions and 8,347 deletions.
56 changes: 56 additions & 0 deletions .github/workflows/linux_interactive.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# The purpose of this particular test definition is to support on-demand
# interactive command shells. We sometimes see problems that occur only in the
# Github Runner environments, and in order to explore what is happening we need
# an interactive prompt (the alternative is hours-per-cycle submit and test
# loops, which doesn't scale at all.)
#
# Unlike the other BRL-CAD tests, this one is started manually from the Github
# website. For more information see https://mxschmitt.github.io/action-tmate/
#
# The "recommended" way to use this action is for the dev to make a fork of
# the repository, alter the configure and/or build logic below for their
# particular use case (the example below is a libged-only build used to zero
# in on a specific libged behavior) before running.

name: BRL-CAD Linux Interactive Debugging

on: [workflow_dispatch]

jobs:

linux:
name: Ubuntu Latest GCC
runs-on: ubuntu-latest
steps:

- name: Setup - CMake
uses: lukka/get-cmake@latest

- name: Setup - System
env:
DEBIAN_FRONTEND: noninteractive
run: |
sudo apt-get update
# Install XCB/OpenGL dev pkgs for Qt - see:
# https://wiki.qt.io/Building_Qt_6_from_Git
# https://doc.qt.io/qt-6/linux-requirements.html
sudo apt-get install libfontconfig1-dev libfreetype6-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-cursor-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev
sudo apt-get install libgl-dev
sudo apt-get install libinput-dev
sudo apt-get clean
- name: Checkout
uses: actions/checkout@v4

- name: Build Directory setup
run: |
cmake -E make_directory ./build_linux
- name: Configure
run: |
export PATH=$ENV{GITHUB_WORKSPACE}:$PATH
cmake -S . -G Ninja -B build -DENABLE_ALL=ON -DGIT_SHALLOW_CLONE=ON -DCMAKE_BUILD_TYPE=Debug
- name: Debugging - tmate session
uses: mxschmitt/action-tmate@v3

5 changes: 0 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,6 @@
path = utahrle/utahrle
url = https://github.com/BRL-CAD/utahrle
ignore = dirty
[submodule "poly2tri/poly2tri"]
path = poly2tri/poly2tri
url = https://github.com/BRL-CAD/poly2tri
branch = RELEASE
ignore = dirty
[submodule "tk/tk"]
path = tk/tk
url = https://github.com/BRL-CAD/tk
Expand Down
6 changes: 3 additions & 3 deletions CMake/FindOPENNURBS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ set(_OPENNURBS_SEARCH_NORMAL
unset(_OPENNURBS_x86)
list(APPEND _OPENNURBS_SEARCHES _OPENNURBS_SEARCH_NORMAL)

set(OPENNURBS_NAMES openNURBS)
set(OPENNURBS_NAMES openNURBS OpenNURBS)

# Try each search configuration.
foreach(search ${_OPENNURBS_SEARCHES})
find_path(OPENNURBS_INCLUDE_DIR NAMES opennurbs.h ${${search}} PATH_SUFFIXES include include/openNURBS openNURBS)
find_path(OPENNURBS_X_INCLUDE_DIR NAMES opennurbs_x.h ${${search}} PATH_SUFFIXES include include/openNURBS openNURBS)
find_path(OPENNURBS_INCLUDE_DIR NAMES opennurbs.h ${${search}} PATH_SUFFIXES include include/openNURBS openNURBS include/OpenNURBS OpenNURBS)
find_path(OPENNURBS_X_INCLUDE_DIR NAMES opennurbs_x.h ${${search}} PATH_SUFFIXES include include/openNURBS openNURBS include/OpenNURBS OpenNURBS)
endforeach()

# Allow OPENNURBS_LIBRARY to be set manually, as the location of the openNURBS library
Expand Down
Loading

0 comments on commit 6f3de9d

Please sign in to comment.