diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-06-29 17:51:27 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2017-06-29 17:51:27 +0000 |
| commit | 3eb6b7ea5843559d45806d20729934abd5fc3911 (patch) | |
| tree | 6f4b18f0efddf7739fc055d19c2532734f473667 /CMake/setup.cmake | |
| parent | 7dc496e97d3d9fbc71ffd75b6c4ceb5cfe93ffa5 (diff) | |
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
Diffstat (limited to 'CMake/setup.cmake')
| -rw-r--r-- | CMake/setup.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMake/setup.cmake b/CMake/setup.cmake index a746e89c7..1ed7c95d0 100644 --- a/CMake/setup.cmake +++ b/CMake/setup.cmake @@ -20,6 +20,7 @@ ####################################################################### # basic setup ####################################################################### + # The FLTK version set(FLTK_VERSION_MAJOR "1") set(FLTK_VERSION_MINOR "4") @@ -27,14 +28,14 @@ set(FLTK_VERSION_PATCH "0") set(FLTK_VERSION "${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}") set(FLTK_VERSION_FULL "${FLTK_VERSION}.${FLTK_VERSION_PATCH}") -set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin) -set(LIBRARY_OUTPUT_PATH ${FLTK_BINARY_DIR}/lib) -set(ARCHIVE_OUTPUT_PATH ${FLTK_BINARY_DIR}/lib) +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) +set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) +set(ARCHIVE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) # Search for modules in the FLTK source dir first -set(CMAKE_MODULE_PATH "${FLTK_SOURCE_DIR}/CMake") +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") -set(FLTK_INCLUDE_DIRS ${FLTK_BINARY_DIR} ${FLTK_SOURCE_DIR}) +set(FLTK_INCLUDE_DIRS ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}) include_directories(${FLTK_INCLUDE_DIRS}) # Setup install locations |