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

COMP: Add support for building against pre-built GLEW and TIFF projects #239

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
8 changes: 6 additions & 2 deletions Superbuild/External_GLEW.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ if(NOT DEFINED GLEW_DIR AND NOT Autoscoper_USE_SYSTEM_${proj})
${${proj}_DEPENDENCIES}
)
set(GLEW_DIR ${EP_INSTALL_DIR}/${Autoscoper_LIB_DIR}/cmake/glew)
ExternalProject_Message(${proj} "GLEW_DIR:${GLEW_DIR}")
mark_as_superbuild(GLEW_DIR:PATH)

else()
ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
endif()

ExternalProject_Message(${proj} "GLEW_DIR:${GLEW_DIR}")
mark_as_superbuild(GLEW_DIR:PATH)
19 changes: 11 additions & 8 deletions Superbuild/External_TIFF.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,15 @@ if((NOT DEFINED TIFF_INCLUDE_DIR
set(TIFF_LIBRARY ${tiff_DIR}/${Autoscoper_LIB_DIR}/libtiff.so)
endif()

mark_as_superbuild(
VARS
TIFF_INCLUDE_DIR:PATH
TIFF_LIBRARY:PATH
)

ExternalProject_Message(${proj} "TIFF_INCLUDE_DIR:${TIFF_INCLUDE_DIR}")
ExternalProject_Message(${proj} "TIFF_LIBRARY:${TIFF_LIBRARY}")
else()
ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
endif()

mark_as_superbuild(
VARS
TIFF_INCLUDE_DIR:PATH
TIFF_LIBRARY:PATH
)

ExternalProject_Message(${proj} "TIFF_INCLUDE_DIR:${TIFF_INCLUDE_DIR}")
ExternalProject_Message(${proj} "TIFF_LIBRARY:${TIFF_LIBRARY}")
Loading