diff --git a/README.md b/README.md index 3bda5d4c..874df06b 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ After the `find_package(FairMQ)` call the following CMake variables are defined: | `${FairMQ_#COMPONENT#_FOUND}` | `TRUE` if this component was built | | `${FairMQ_VERSION}` | the version in format `MAJOR.MINOR.PATCH` | | `${FairMQ_GIT_VERSION}` | the version in the format returned by `git describe --tags --dirty --match "v*"` | -| `${FairMQ_ROOT}` | the actual installation prefix, notice the difference to the hint variable `FAIRMQ_ROOT` | +| `${FairMQ_PREFIX}` | the actual installation prefix | | `${FairMQ_BINDIR}` | the installation bin directory | | `${FairMQ_INCDIR}` | the installation include directory | | `${FairMQ_LIBDIR}` | the installation lib directory | diff --git a/cmake/FairMQConfig.cmake.in b/cmake/FairMQConfig.cmake.in index 015ebccb..431a2586 100644 --- a/cmake/FairMQConfig.cmake.in +++ b/cmake/FairMQConfig.cmake.in @@ -13,7 +13,7 @@ set(@PROJECT_NAME@_VERSION @PROJECT_VERSION@) set(@PROJECT_NAME@_GIT_VERSION @PROJECT_GIT_VERSION@) set(@PROJECT_NAME@_GIT_DATE @PROJECT_GIT_DATE@) -set_and_check(@PROJECT_NAME@_ROOT @PACKAGE_CMAKE_INSTALL_PREFIX@) +set_and_check(@PROJECT_NAME@_PREFIX @PACKAGE_CMAKE_INSTALL_PREFIX@) set_and_check(@PROJECT_NAME@_BINDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_BINDIR@) set_and_check(@PROJECT_NAME@_INCDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@) set_and_check(@PROJECT_NAME@_LIBDIR @PACKAGE_CMAKE_INSTALL_PREFIX@/@PROJECT_INSTALL_LIBDIR@) diff --git a/cmake/FairMQLib.cmake b/cmake/FairMQLib.cmake index 82e2660c..70dbfd26 100644 --- a/cmake/FairMQLib.cmake +++ b/cmake/FairMQLib.cmake @@ -40,6 +40,7 @@ macro(set_fairmq_cmake_policies) CMP0042 # MACOSX_RPATH is enabled by default. CMP0048 # The ``project()`` command manages VERSION variables. CMP0054 # Only interpret ``if()`` arguments as variables or keywords when unquoted. + CMP0074 # ``find_package()`` uses ``_ROOT`` variables. ) if(POLICY ${policy}) cmake_policy(SET ${policy} NEW)