diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-11-30 10:34:43 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-11-30 10:34:43 +0000 |
| commit | 8c56fc7e225b0d8d6ab9b3f9e4bce6758151ec62 (patch) | |
| tree | 76aef4c350a8554773d02ce292f37aa7741227d9 /CMake | |
| parent | 806542a84fb41720718e2a1afd91f4f0ede49c26 (diff) | |
Updated CMake files with patches from Michael Surette (STR #2317).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7919 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/FLTKConfig.cmake.in | 13 | ||||
| -rw-r--r-- | CMake/install-symlinks.cmake.in | 17 |
2 files changed, 29 insertions, 1 deletions
diff --git a/CMake/FLTKConfig.cmake.in b/CMake/FLTKConfig.cmake.in index 0501c6674..fb4f425ce 100644 --- a/CMake/FLTKConfig.cmake.in +++ b/CMake/FLTKConfig.cmake.in @@ -7,7 +7,7 @@ set(FLTK_FOUND TRUE) set(FLTK_VERSION @FLTK_VERSION_FULL@) -set(FLTK_FLUID_EXECUTABLE "@PREFIX_BIN@/fluid") +set(FLTK_FLUID_EXECUTABLE "@FLTK_FLUID_PATH@") if(NOT "@EXE_LINKER_FLAGS@" STREQUAL "") set(FLTK_EXE_LINKER_FLAGS "@EXE_LINKER_FLAGS@") @@ -35,4 +35,15 @@ set(FLTK_XINERAMA_FOUND @FLTK_XINERAMA_FOUND@) set(FLTK_XFT_FOUND @FLTK_XFT_FOUND@) set(FLTK_XDBE_FOUND @FLTK_XDBE_FOUND@) +set(FLTK_CAIRO_FOUND @FLTK_CAIRO_FOUND@) +set(FLTK_GL_FOUND @FLTK_GL_FOUND@) +set(FLTK_THREADS_FOUND @FLTK_THREADS_FOUND@) +set(FLTK_PTHREADS_FOUND @FLTK_PTHREADS_FOUND@) +set(FLTK_BUILTIN_JPEG_FOUND @FLTK_BUILTIN_JPEG_FOUND@) +set(FLTK_BUILTIN_ZLIB_FOUND @FLTK_BUILTIN_ZLIB_FOUND@) +set(FLTK_BUILTIN_PNG_FOUND @FLTK_BUILTIN_PNG_FOUND@) +set(FLTK_XINERAMA_FOUND @FLTK_XINERAMA_FOUND@) +set(FLTK_XFT_FOUND @FLTK_XFT_FOUND@) +set(FLTK_XDBE_FOUND @FLTK_XDBE_FOUND@) + include("@PREFIX_CONFIG@/FLTKLibraries.cmake") diff --git a/CMake/install-symlinks.cmake.in b/CMake/install-symlinks.cmake.in new file mode 100644 index 000000000..2febc1a53 --- /dev/null +++ b/CMake/install-symlinks.cmake.in @@ -0,0 +1,17 @@ + +# On unix create backward compatibility symlinks +if(NOT EXISTS @PREFIX_INCLUDE@/Fl) + EXECUTE_PROCESS(COMMAND ln -s FL Fl + WORKING_DIRECTORY @PREFIX_INCLUDE@ + ) +endif(NOT EXISTS @PREFIX_INCLUDE@/Fl) + +file(GLOB FLTK_HEADER_FILES @PREFIX_INCLUDE@/FL/*.H) +foreach(file ${FLTK_HEADER_FILES}) + GET_FILENAME_COMPONENT(nameWE ${file} NAME_WE) + if(NOT EXISTS @PREFIX_INCLUDE@/FL/${nameWE}.h) + EXECUTE_PROCESS(COMMAND ln -s ${nameWE}.H ${nameWE}.h + WORKING_DIRECTORY @PREFIX_INCLUDE@/FL + ) + endif() +endforeach(file) |