Merge branch 'main' into RELEASE

BRL-CAD · Sep 1, 2024 · 5aaa811 · 5aaa811
2 parents c7be60c + 05c22d7
commit 5aaa811
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/assetimport/CMakeLists.txt b/assetimport/CMakeLists.txt
@@ -24,7 +24,7 @@ if (ENABLE_ASSETIMPORT)
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
     -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
-    -DPUGIXML_ROOT=$<$<BOOL:${PUGIXML_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    -Dpugixml_ROOT=$<$<BOOL:${PUGIXML_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}

diff --git a/dependencies.cmake b/dependencies.cmake
@@ -257,7 +257,7 @@ add_project(osmesa GROUPS "BRLCAD")
 
 # Geogram - a programming library with geometric algorithms
 # https://github.com/BrunoLevy/geogram
-add_project(geogram GROUPS "BRLCAD_EXTRA")
+add_project(geogram GROUPS "BRLCAD")
 
 # Open Shading Language (OSL) - language for programmable shading
 # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage