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.

Sign up for GitHub

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

Mark macOS CMake variables as advanced #175

Closed
wants to merge 2 commits into from
Closed

Mark macOS CMake variables as advanced #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8703c54
Mark macOS CMake variables as advanced
thewtex May 16, 2024
b5f19d6
Merge branch 'master' into macos-cmake-advanced
malaterre May 22, 2024
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
9 changes: 6 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
else()
set(GDCM_CMAKE_POLICY_VERSION "${GDCM_MAX_VALIDATED_CMAKE_VERSION}")
endif()
cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION})
cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION})

# GDCM version 3.0.0 will only support C++11 and greater
if(CMAKE_CXX_STANDARD EQUAL "98" )
Expand All @@ -23,7 +23,7 @@ project(GDCM
## NOTE: the "DESCRIPTION" feature of project() was introduced in cmake 3.10.0
set(PROJECT_DESCRIPTION "GDCM - Grassroots DICOM. GDCM is yet another DICOM library.")

## Set aliases for backwards compatibility. GDCM_VERSION_XXX are configured by the project() command
## Set aliases for backwards compatibility. GDCM_VERSION_XXX are configured by the project() command
set(GDCM_MAJOR_VERSION ${GDCM_VERSION_MAJOR})
set(GDCM_MINOR_VERSION ${GDCM_VERSION_MINOR})
set(GDCM_BUILD_VERSION ${GDCM_VERSION_PATCH})
Expand Down Expand Up @@ -564,7 +564,10 @@ if(APPLE)
if(GDCM_USE_COREFOUNDATION_LIBRARY)
find_library(COREFOUNDATION_LIBRARY CoreFoundation )
endif()
mark_as_advanced(COREFOUNDATION_LIBRARY)
mark_as_advanced(
GDCM_USE_COREFOUNDATION_LIBRARY
COREFOUNDATION_LIBRARY
)
endif()

#-----------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions Utilities/gdcmopenjpeg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ if (APPLE)
list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
endif()
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
mark_as_advanced(OPJ_USE_DSYMUTIL)
endif()

#-----------------------------------------------------------------------------
Expand Down
Loading