From 7aef0cad39e55e6fb18917cf80ddb7aa433b1180 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 10 Jan 2018 20:49:03 +0000 Subject: CMake: enable building FLTK in a subdirectory of another project. Basically replace CMAKE_XXX_DIR with CMAKE_CURRENT_XXX_DIR where XXX = SOURCE or BINARY. Patch proposal by cleanrock, FLTK PR #4: https://github.com/fltk/test-only/pull/4 Patch modified to fix target dirs for test programs and doxygen docs. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12630 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CMake/install.cmake | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'CMake/install.cmake') diff --git a/CMake/install.cmake b/CMake/install.cmake index f3eb3b3a0..cb4f8fe71 100644 --- a/CMake/install.cmake +++ b/CMake/install.cmake @@ -4,7 +4,7 @@ # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org) # Written by Michael Surette # -# Copyright 1998-2017 by Bill Spitzak and others. +# Copyright 1998-2018 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -31,17 +31,17 @@ add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" ) -install(DIRECTORY ${CMAKE_SOURCE_DIR}/FL +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/FL DESTINATION ${FLTK_INCLUDEDIR} USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE ) -install(DIRECTORY ${CMAKE_BINARY_DIR}/FL +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/FL DESTINATION ${FLTK_INCLUDEDIR} USE_SOURCE_PERMISSIONS ) if(OPTION_CREATE_LINKS) - install(SCRIPT ${CMAKE_BINARY_DIR}/install-symlinks.cmake) + install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install-symlinks.cmake) endif(OPTION_CREATE_LINKS) # generate FLTKConfig.cmake for installed directory use @@ -55,22 +55,22 @@ install(EXPORT FLTK-Targets ) configure_file( - ${CMAKE_SOURCE_DIR}/CMake/FLTKConfig.cmake.in - ${CMAKE_BINARY_DIR}/etc/FLTKConfig.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/CMake/FLTKConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/etc/FLTKConfig.cmake @ONLY ) -install(FILES ${CMAKE_BINARY_DIR}/etc/FLTKConfig.cmake +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/etc/FLTKConfig.cmake DESTINATION ${FLTK_CONFIG_PATH} ) configure_file( - ${CMAKE_SOURCE_DIR}/CMake/UseFLTK.cmake.in - ${CMAKE_BINARY_DIR}/etc/UseFLTK.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/CMake/UseFLTK.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/etc/UseFLTK.cmake @ONLY ) -install(FILES ${CMAKE_BINARY_DIR}/etc/UseFLTK.cmake +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/etc/UseFLTK.cmake DESTINATION ${FLTK_CONFIG_PATH} ) @@ -85,24 +85,24 @@ set(srcdir ".") set(LIBNAME "${libdir}/libfltk.a") configure_file( - "${CMAKE_SOURCE_DIR}/fltk-config.in" - "${CMAKE_BINARY_DIR}/bin/fltk-config" + "${CMAKE_CURRENT_SOURCE_DIR}/fltk-config.in" + "${CMAKE_CURRENT_BINARY_DIR}/bin/fltk-config" @ONLY ) if(UNIX) execute_process(COMMAND chmod 755 fltk-config - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/bin" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin" ) endif(UNIX) -install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/fltk-config +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/fltk-config DESTINATION ${FLTK_BINDIR} ) if(UNIX OR MSYS OR (MINGW AND CMAKE_CROSSCOMPILING)) macro(INSTALL_MAN FILE LEVEL) install(FILES - ${CMAKE_SOURCE_DIR}/documentation/src/${FILE}.man + ${CMAKE_CURRENT_SOURCE_DIR}/documentation/src/${FILE}.man DESTINATION ${FLTK_MANDIR}/man${LEVEL} RENAME ${FILE}.${LEVEL} ) -- cgit v1.2.3