diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2005-12-16 15:22:29 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2005-12-16 15:22:29 +0000 |
| commit | a333f29b910851e0a18a0fc0898f7d6e475db41d (patch) | |
| tree | 5c782d964ad1dbd4d1e0e038c2b5ca247f07ffd5 | |
| parent | 5552a0cce720dfa7b3fa22222863432537c175ed (diff) | |
STR #1123: Fixed include path in CMake build. I don't use CMake, but since this patch was contributed by the same company that *wrote* CMake, I have a good feeling that they know what they are doing.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4715 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -3,7 +3,9 @@ CHANGES IN FLTK 1.1.7 - Documentation fixes (STR #571, STR #648, STR #692, STR #730, STR #744, STR #745, STR #931, STR #942, STR #960, STR #969) - - Fixed unnecessary delay in WIN32 event handling (STR #1104) + - Fixed include path for CMake build (STR #1123) + - Fixed unnecessary delay in WIN32 event handling + (STR #1104) - Fixed handling of Crl-C in Fl_Text_Display (STR #1122) - OS X Quartz version now draw a nice resize control (STR #1099) diff --git a/CMakeLists.txt b/CMakeLists.txt index a760353fd..218934bb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,7 +367,7 @@ SET(FLTK_LIBRARY_DEPENDS_FILE ${FLTK_BINARY_DIR}/FLTKLibraryDepends.cmake) SET(FLTK_EXECUTABLE_DIRS ${EXECUTABLE_OUTPUT_PATH}) SET(FLTK_LIBRARY_DIRS ${LIBRARY_OUTPUT_PATH}) SET(FLTK_USE_FILE ${FLTK_SOURCE_DIR}/CMake/FLTKUse.cmake) -SET(FLTK_INCLUDE_DIRS "${FLTK_BINARY_DIR}/FL") +SET(FLTK_INCLUDE_DIRS "${FLTK_BINARY_DIR}/") SET(FLTK_BUILD_SETTINGS_FILE ${FLTK_BINARY_DIR}/FLTKBuildSettings.cmake) SET(prefix "${FLTK_BINARY_DIR}") SET(exec_prefix "${prefix}") @@ -388,7 +388,7 @@ SET(FLTK_LIBRARY_DEPENDS_FILE ${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/F SET(FLTK_EXECUTABLE_DIRS "${CMAKE_INSTALL_PREFIX}/bin") SET(FLTK_LIBRARY_DIRS "${CMAKE_INSTALL_PREFIX}/lib") SET(FLTK_USE_FILE "${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKUse.cmake") -SET(FLTK_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/FL") +SET(FLTK_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/") SET(FLTK_BUILD_SETTINGS_FILE ${CMAKE_INSTALL_PREFIX}/lib/FLTK-${FLTK_VERSION}/FLTKBuildSettings.cmake) SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(exec_prefix "${prefix}") |