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

1 files changed, 15 insertions, 15 deletions

diff --git a/CMake/export.cmake b/CMake/export.cmake
index cdf508a64..31e5cf342 100644
--- a/CMake/export.cmake
+++ b/CMake/export.cmake
@@ -46,39 +46,39 @@ export(TARGETS ${FLUID} ${FLTK_LIBRARIES} FILE ${CMAKE_BINARY_DIR}/FLTK-Targets.
 
 # generate FLTKConfig.cmake for build directory use
 set(INCLUDE_DIRS "${FLTK_INCLUDE_DIRS}")
-set(CONFIG_PATH ${FLTK_BINARY_DIR})
+set(CONFIG_PATH ${CMAKE_BINARY_DIR})
 
 configure_file(
-   ${FLTK_SOURCE_DIR}/CMake/FLTKConfig.cmake.in
-   ${FLTK_BINARY_DIR}/FLTKConfig.cmake
+   ${CMAKE_SOURCE_DIR}/CMake/FLTKConfig.cmake.in
+   ${CMAKE_BINARY_DIR}/FLTKConfig.cmake
    @ONLY
 )
 
 # generate UseFLTK.cmake for build directory use
 configure_file(
-   ${FLTK_SOURCE_DIR}/CMake/UseFLTK.cmake.in
-   ${FLTK_BINARY_DIR}/UseFLTK.cmake
+   ${CMAKE_SOURCE_DIR}/CMake/UseFLTK.cmake.in
+   ${CMAKE_BINARY_DIR}/UseFLTK.cmake
    @ONLY
 )
 
 # generate fltk-config for build directory use
-set(prefix ${FLTK_BINARY_DIR})
+set(prefix ${CMAKE_BINARY_DIR})
 set(exec_prefix "\${prefix}")
-set(includedir "${FLTK_SOURCE_DIR}")
-set(BINARY_DIR "${FLTK_BINARY_DIR}")
+set(includedir "${CMAKE_SOURCE_DIR}")
+set(BINARY_DIR "${CMAKE_BINARY_DIR}")
 set(libdir "\${exec_prefix}/lib")
 set(srcdir ".")
 
 set(LIBNAME "${libdir}/libfltk.a")
 
 configure_file(
-   "${FLTK_SOURCE_DIR}/fltk-config.in"
-   "${FLTK_BINARY_DIR}/fltk-config"
+   "${CMAKE_SOURCE_DIR}/fltk-config.in"
+   "${CMAKE_BINARY_DIR}/fltk-config"
    @ONLY
 )
 if(UNIX)
    execute_process(COMMAND chmod 755 fltk-config
-      WORKING_DIRECTORY "${FLTK_BINARY_DIR}"
+      WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
    )
 endif(UNIX)
 
@@ -102,8 +102,8 @@ set(CONFIG_H config.h)
 # generate config.h
 
 configure_file(
-   "${FLTK_SOURCE_DIR}/${CONFIG_H_IN}"
-   "${FLTK_BINARY_DIR}/${CONFIG_H}"
+   "${CMAKE_SOURCE_DIR}/${CONFIG_H_IN}"
+   "${CMAKE_BINARY_DIR}/${CONFIG_H}"
    @ONLY
 )
 
@@ -115,8 +115,8 @@ if(OPTION_CREATE_LINKS)
       set(PREFIX_INCLUDE "${CMAKE_INSTALL_PREFIX}/${FLTK_INCLUDEDIR}")
    endif(IS_ABSOLUTE ${FLTK_INCLUDEDIR})
    configure_file(
-      "${FLTK_SOURCE_DIR}/CMake/install-symlinks.cmake.in"
-      "${FLTK_BINARY_DIR}/install-symlinks.cmake"
+      "${CMAKE_SOURCE_DIR}/CMake/install-symlinks.cmake.in"
+      "${CMAKE_BINARY_DIR}/install-symlinks.cmake"
       @ONLY
    )
 endif(OPTION_CREATE_LINKS)