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/options.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/options.cmake')
| -rw-r--r-- | CMake/options.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index 0b6d2c098..6096b7861 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -264,8 +264,8 @@ if(OPTION_USE_SYSTEM_ZLIB AND ZLIB_FOUND) else() add_subdirectory(zlib) set(FLTK_ZLIB_LIBRARIES fltk_z) - set(ZLIB_INCLUDE_DIR ${FLTK_SOURCE_DIR}/zlib) - include_directories(${FLTK_SOURCE_DIR}/zlib) + set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/zlib) + include_directories(${CMAKE_SOURCE_DIR}/zlib) set(FLTK_BUILTIN_ZLIB_FOUND TRUE) endif(OPTION_USE_SYSTEM_ZLIB AND ZLIB_FOUND) @@ -289,7 +289,7 @@ if(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND) else() add_subdirectory(jpeg) set(FLTK_JPEG_LIBRARIES fltk_jpeg) - include_directories(${FLTK_SOURCE_DIR}/jpeg) + include_directories(${CMAKE_SOURCE_DIR}/jpeg) set(FLTK_BUILTIN_JPEG_FOUND TRUE) endif(OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND) @@ -317,7 +317,7 @@ else() set(HAVE_PNG_H 1) set(HAVE_PNG_GET_VALID 1) set(HAVE_PNG_SET_TRNS_TO_ALPHA 1) - include_directories(${FLTK_SOURCE_DIR}/png) + include_directories(${CMAKE_SOURCE_DIR}/png) set(FLTK_BUILTIN_PNG_FOUND TRUE) endif(OPTION_USE_SYSTEM_LIBPNG AND PNG_FOUND) |