Skip to content

fix(cmake): move GNUInstallDirs include into cet_cmake_env macro #40

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

Open
greenc-FNAL wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(cmake): move GNUInstallDirs include into cet_cmake_env macro #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 13 additions & 12 deletions Modules/CetCMakeEnv.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,6 @@ if(NOT CMAKE_INSTALL_LIBDIR)
set(CMAKE_INSTALL_LIBDIR lib) # Don't use lib64 for installation dir.
endif()

# See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html.
#
# We suppress developer warnings for this `include()` to silence
# complaints from CMake >=4 when no `LANGUAGES` are enabled for this
# project.
set(_cce_suppress_dev_warnings "$CACHE{CMAKE_SUPPRESS_DEVELOP_WARNINGS}")
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS ON CACHE INTERNAL "" FORCE)
include(GNUInstallDirs)
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS "${_cce_suppress_dev_warnings}" CACHE INTERNAL "" FORCE)
unset(_cce_suppress_dev_warnings)
# ##############################################################################

define_property(
TARGET
PROPERTY CET_EXEC_LOCATION
Expand Down Expand Up @@ -116,6 +104,19 @@ macro(cet_cmake_env)
)
endif()

# ##############################################################################
# See https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html.
#
# We suppress developer warnings for this `include()` to silence
# complaints from CMake >=4 when no `LANGUAGES` are enabled for this
# project.
set(_cce_suppress_dev_warnings "$CACHE{CMAKE_SUPPRESS_DEVELOP_WARNINGS}")
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS ON CACHE INTERNAL "" FORCE)
include(GNUInstallDirs)
set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS "${_cce_suppress_dev_warnings}" CACHE INTERNAL "" FORCE)
unset(_cce_suppress_dev_warnings)
# ##############################################################################
Comment on lines +107 to +118

set(CETMODULES_CURRENT_PROJECT_NAME ${PROJECT_NAME})

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