summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2015-04-06 13:06:21 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2015-04-06 13:06:21 +0000
commitd767ae7ff6422bc8e337ced4a21085176b2ec490 (patch)
tree4c764d74af70ff483cd41d88dc016635a100859d
parent0b3471658da70e09e6ded978446e6941a9c0b8db (diff)
[CMake] Fix and install fltk-config.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10679 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CMake/install.cmake4
-rw-r--r--fltk-config.cmake.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/CMake/install.cmake b/CMake/install.cmake
index 3d3df3e7a..974faa8ae 100644
--- a/CMake/install.cmake
+++ b/CMake/install.cmake
@@ -70,6 +70,10 @@ install(FILES ${FLTK_BINARY_DIR}/etc/UseFLTK.cmake
DESTINATION ${FLTK_CONFIG_PATH}
)
+install(PROGRAMS ${FLTK_BINARY_DIR}/fltk-config
+ DESTINATION ${FLTK_BINDIR}
+)
+
if(UNIX OR MSYS OR (MINGW AND CMAKE_CROSSCOMPILING))
macro(INSTALL_MAN FILE LEVEL)
install(FILES
diff --git a/fltk-config.cmake.in b/fltk-config.cmake.in
index 5743c3b46..6e05bd03c 100644
--- a/fltk-config.cmake.in
+++ b/fltk-config.cmake.in
@@ -49,7 +49,7 @@ OPTIM="@OPTION_OPTIM@"
CAIROFLAGS="@CAIROFLAGS@"
# Check for local invocation, and update paths accordingly...
-if test -f "$selfdir/bin/fluid"; then
+if test -f "$selfdir/config.h"; then
includedir="@FLTK_SOURCE_DIR@"
libdir="$selfdir/lib"