diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-11-24 09:35:04 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-11-24 09:35:04 +0000 |
| commit | f7b50362c4c2dfd33b90f018a058b4604da006f8 (patch) | |
| tree | bce075ce2b93fc92b03a56181ab8273fd8e2e629 | |
| parent | fd4784a340b39877db5cd73366346205585fd110 (diff) | |
[CMake] Fix CMake 3.1 warning about new policy CMP0053.
CMake Warning (dev) at CMake/export.cmake:48 (set):
Policy CMP0053 is not set: Simplify variable reference and escape sequence
evaluation. Run "cmake --help-policy CMP0053" for policy details. Use the
cmake_policy command to set the policy and suppress this warning.
Changed old-style @variable@ replacement to ${variable}.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10467 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CMake/export.cmake | 4 | ||||
| -rw-r--r-- | CMake/install.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMake/export.cmake b/CMake/export.cmake index af665f3e9..2e1d2640e 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake @@ -45,8 +45,8 @@ add_subdirectory(src) export(TARGETS ${FLUID} ${FLTK_LIBRARIES} FILE ${CMAKE_BINARY_DIR}/FLTK-Targets.cmake) # generate FLTKConfig.cmake for build directory use -set(INCLUDE_DIRS "@FLTK_INCLUDE_DIRS@") -set(CONFIG_PATH @FLTK_BINARY_DIR@) +set(INCLUDE_DIRS "${FLTK_INCLUDE_DIRS}") +set(CONFIG_PATH ${FLTK_BINARY_DIR}) configure_file( ${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in diff --git a/CMake/install.cmake b/CMake/install.cmake index c585ebe2f..2e8f76c96 100644 --- a/CMake/install.cmake +++ b/CMake/install.cmake @@ -43,7 +43,7 @@ endif(OPTION_CREATE_LINKS) # generate FLTKConfig.cmake for installed directory use set(INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include) -set(CONFIG_PATH ${CMAKE_INSTALL_PREFIX}/@FLTK_CONFIG_PATH@) +set(CONFIG_PATH ${CMAKE_INSTALL_PREFIX}/${FLTK_CONFIG_PATH}) install(EXPORT FLTK-Targets DESTINATION ${FLTK_CONFIG_PATH} |