Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[build] Fix GLUT dependency handling on Windows #1827

Merged
merged 4 commits into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,7 @@ jobs:
- name: Test DART and dartpy
run: |
pixi run test-all

- name: Install
run: |
pixi run install
4 changes: 4 additions & 0 deletions .github/workflows/ci_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,7 @@ jobs:
- name: Test DART and dartpy
run: |
pixi run test-all

- name: Install
run: |
pixi run install
4 changes: 4 additions & 0 deletions .github/workflows/ci_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,7 @@ jobs:
- name: Test DART and dartpy
run: |
pixi run test # TODO: Change to test-all

- name: Install
run: |
pixi run install
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

## DART 6

### [DART 6.14.4 (TBD)](https://github.com/dartsim/dart/milestone/81?closed=1)

* Tested Platforms

* Linux
* Ubuntu 22.04 LTS / GCC 11.4 / x86_64
* Ubuntu 24.04 LTS / GCC 13.2 / x86_64
* macOS 14 / Clang 15 / arm64
* Windows / MSVC 19.40 / x86_64

* Fixed GLUT dependency handling on Windows: [#1827](https://github.com/dartsim/dart/pull/1827)

### [DART 6.14.3 (2024-07-05)](https://github.com/dartsim/dart/milestone/80?closed=1)

* Tested Platforms
Expand Down
9 changes: 1 addition & 8 deletions dart/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ if(WIN32 AND NOT CYGWIN)
else()
dart_check_optional_package(GLUT "dart-gui" "freeglut3")
endif()
if(GLUT_FOUND)
set(HAVE_GLUT TRUE)
else()
set(HAVE_GLUT FALSE)
endif()

# Search all header and source files
file(GLOB hdrs "*.hpp" "*.h" "detail/*.hpp")
Expand Down Expand Up @@ -68,9 +63,7 @@ add_component_dependencies(
external-lodepng
)
add_component_dependency_packages(${PROJECT_NAME} ${component_name} OpenGL)
if(NOT WIN32 OR CYGWIN)
add_component_dependency_packages(${PROJECT_NAME} ${component_name} GLUT)
endif()
add_component_dependency_packages(${PROJECT_NAME} ${component_name} GLUT)

# Add subdirectories
add_subdirectory(osg)
Expand Down
11 changes: 9 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ install-local = { cmd = "cmake --install build --prefix $CONDA_PREFIX", depends_
"build",
] }

configure = { cmd = "cmake -G Ninja -S . -B build -DCMAKE_BUILD_TYPE=Release -DDART_VERBOSE=ON -DDART_USE_SYSTEM_IMGUI=ON" }
configure = { cmd = "cmake -G Ninja -S . -B build -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release -DDART_VERBOSE=ON -DDART_USE_SYSTEM_IMGUI=ON" }

lint = { cmd = "cmake --build build --target format && black . && isort .", depends_on = [
"configure",
Expand Down Expand Up @@ -96,6 +96,10 @@ bm-kinematics = { cmd = "cmake --build build --target BM_INTEGRATION_kinematics
"configure",
] }

install = { cmd = "cmake --build build --target install --parallel", depends_on = [
"build",
] }

create-deps-dir = { cmd = "mkdir -p .deps" }
remove-deps-dir = { cmd = "rm -rf .deps" }

Expand Down Expand Up @@ -145,7 +149,7 @@ imgui = ">=1.90.4,<1.91"
freeglut = ">=3.2.2,<3.3"

[target.win-64.tasks]
configure = { cmd = "cmake -S . -B build -G 'Visual Studio 17 2022' -DDART_VERBOSE=ON -DDART_MSVC_DEFAULT_OPTIONS=ON -DBUILD_SHARED_LIBS=OFF -DDART_USE_SYSTEM_IMGUI=OFF" }
configure = { cmd = "cmake -S . -B build -G 'Visual Studio 17 2022' -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DDART_VERBOSE=ON -DDART_MSVC_DEFAULT_OPTIONS=ON -DBUILD_SHARED_LIBS=OFF -DDART_USE_SYSTEM_IMGUI=OFF" }
lint = { cmd = "black . && isort .", depends_on = ["configure"] }
check-lint = { cmd = "black . --check && isort . --check", depends_on = [
"configure",
Expand All @@ -168,3 +172,6 @@ test-dartpy = { cmd = "cmake --build build --config Release -j --target pytest",
test-all = { cmd = "cmake --build build --config Release -j --target ALL", depends_on = [
"configure",
] }
install = { cmd = "cmake --build build --config Release -j --target install", depends_on = [
"build",
] }
Loading