From 3eb6b7ea5843559d45806d20729934abd5fc3911 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Thu, 29 Jun 2017 17:51:27 +0000
Subject: CMake: replace improperly used variables with correct ones.

CMake variables FLTK_SOURCE_DIR and FLTK_BINARY_DIR are only defined
if the project name is exactly "FLTK" (all uppercase). These variables
are generated (set) by CMake as <PROJECT_NAME>_SOURCE_DIR etc.

The correct variables are CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR,
respectively, which are always defined.

This commit enables future changes of the FLTK project name, e.g. to
"fltk" or "fltk-1.4.0" (a versioned project name), if we like...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12281 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CMake/install.cmake | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'CMake/install.cmake')

diff --git a/CMake/install.cmake b/CMake/install.cmake
index e5b398027..20f58d9e6 100644
--- a/CMake/install.cmake
+++ b/CMake/install.cmake
@@ -31,17 +31,17 @@ add_custom_target(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
 )
 
-install(DIRECTORY ${FLTK_SOURCE_DIR}/FL
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/FL
    DESTINATION ${FLTK_INCLUDEDIR} USE_SOURCE_PERMISSIONS
    PATTERN ".svn" EXCLUDE
 )
 
-install(DIRECTORY ${FLTK_BINARY_DIR}/FL
+install(DIRECTORY ${CMAKE_BINARY_DIR}/FL
    DESTINATION ${FLTK_INCLUDEDIR} USE_SOURCE_PERMISSIONS
 )
 
 if(OPTION_CREATE_LINKS)
-   install(SCRIPT ${FLTK_BINARY_DIR}/install-symlinks.cmake)
+   install(SCRIPT ${CMAKE_BINARY_DIR}/install-symlinks.cmake)
 endif(OPTION_CREATE_LINKS)
 
 # generate FLTKConfig.cmake for installed directory use
@@ -55,22 +55,22 @@ install(EXPORT FLTK-Targets
 )
 
 configure_file(
-   ${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in
-   ${FLTK_BINARY_DIR}/etc/FLTKConfig.cmake
+   ${CMAKE_SOURCE_DIR}/CMake/FLTKConfig.cmake.in
+   ${CMAKE_BINARY_DIR}/etc/FLTKConfig.cmake
    @ONLY
 )
 
-install(FILES ${FLTK_BINARY_DIR}/etc/FLTKConfig.cmake
+install(FILES ${CMAKE_BINARY_DIR}/etc/FLTKConfig.cmake
    DESTINATION ${FLTK_CONFIG_PATH}
 )
 
 configure_file(
-   ${FLTK_SOURCE_DIR}/CMake/UseFLTK.cmake.in
-   ${FLTK_BINARY_DIR}/etc/UseFLTK.cmake
+   ${CMAKE_SOURCE_DIR}/CMake/UseFLTK.cmake.in
+   ${CMAKE_BINARY_DIR}/etc/UseFLTK.cmake
    @ONLY
 )
 
-install(FILES ${FLTK_BINARY_DIR}/etc/UseFLTK.cmake
+install(FILES ${CMAKE_BINARY_DIR}/etc/UseFLTK.cmake
    DESTINATION ${FLTK_CONFIG_PATH}
 )
 
@@ -85,24 +85,24 @@ set(srcdir ".")
 set(LIBNAME "${libdir}/libfltk.a")
 
 configure_file(
-   "${FLTK_SOURCE_DIR}/fltk-config.in"
-   "${FLTK_BINARY_DIR}/bin/fltk-config"
+   "${CMAKE_SOURCE_DIR}/fltk-config.in"
+   "${CMAKE_BINARY_DIR}/bin/fltk-config"
    @ONLY
 )
 if(UNIX)
    execute_process(COMMAND chmod 755 fltk-config
-      WORKING_DIRECTORY "${FLTK_BINARY_DIR}/bin"
+      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
    )
 endif(UNIX)
 
-install(PROGRAMS ${FLTK_BINARY_DIR}/bin/fltk-config
+install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/fltk-config
    DESTINATION ${FLTK_BINDIR}
 )
 
 if(UNIX OR MSYS OR (MINGW AND CMAKE_CROSSCOMPILING))
    macro(INSTALL_MAN FILE LEVEL)
    install(FILES
-      ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man
+      ${CMAKE_SOURCE_DIR}/documentation/src/${FILE}.man
       DESTINATION ${FLTK_MANDIR}/man${LEVEL}
       RENAME ${FILE}.${LEVEL}
    )
-- 
cgit v1.2.3