Skip to content

Commit

Permalink
Correct Geogram variable names for new find_package setup.
Browse files Browse the repository at this point in the history
  • Loading branch information
starseeker committed Mar 7, 2025
1 parent 27d7567 commit a1e824a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/libged/bot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ brlcad_find_package(MANIFOLD REQUIRED)

set(BOT_LIBS libged libbg libbu ${MANIFOLD_LIBRARIES})

brlcad_find_package(GEOGRAM REQUIRED SYSPATTERN geogram)
set(BOT_LOCAL_INCLUDE_DIRS ${BOT_LOCAL_INCLUDE_DIRS} ${GEOGRAM_INCLUDE_DIR})
set(BOT_LIBS ${BOT_LIBS} ${GEOGRAM_LIBRARY})
brlcad_find_package(Geogram REQUIRED SYSPATTERN geogram)
set(BOT_LOCAL_INCLUDE_DIRS ${BOT_LOCAL_INCLUDE_DIRS} ${Geogram_INCLUDE_DIR})
set(BOT_LIBS ${BOT_LIBS} ${Geogram_LIBRARY})

if(BRLCAD_ENABLE_OPENMESH)
brlcad_find_package(OpenMesh)
Expand Down
8 changes: 4 additions & 4 deletions src/libged/facetize/subprocess/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ if(TARGET assimp::assimp AND TARGET pugixml::pugixml)
set(ASSETIMPORT_LIBRARIES assimp::assimp pugixml::pugixml)
endif(TARGET assimp::assimp AND TARGET pugixml::pugixml)

brlcad_find_package(GEOGRAM REQUIRED SYSPATTERN geogram)
add_definitions(-DUSE_GEOGRAM)
brlcad_find_package(Geogram REQUIRED SYSPATTERN geogram)
add_definitions(-DUSE_Geogram)

set(INCLUDE_DIRS ${GEOGRAM_INCLUDE_DIR} ${MANIFOLD_INCLUDE_DIRS})
set(INCLUDE_DIRS ${Geogram_INCLUDE_DIR} ${MANIFOLD_INCLUDE_DIRS})

ged_subprocess_library(facetize_process SHARED ${GED_TESS_SRCS})
target_include_directories(facetize_process SYSTEM PRIVATE ${INCLUDE_DIRS})
target_link_libraries(facetize_process libged;${MANIFOLD_LIBRARIES};${ASSETIMPORT_LIBRARIES};${GEOGRAM_LIBRARY})
target_link_libraries(facetize_process libged;${MANIFOLD_LIBRARIES};${ASSETIMPORT_LIBRARIES};${Geogram_LIBRARY})
set_property(TARGET facetize_process APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD HAVE_CONFIG_H MANIFOLD_DLL_IMPORTS)
validate_style(facetize_process ${GED_TESS_SRCS})
plugin_setup(facetize_process ged_exec)
Expand Down

0 comments on commit a1e824a

Please sign in to comment.