From 14ea12f7320092c44b944be588d184c1dcd9bc3c Mon Sep 17 00:00:00 2001 From: Nils Kneuper Date: Mon, 14 Jul 2008 17:46:42 +0000 Subject: [PATCH] use the CMAKE_MODULE_PATH... ...when the folder with our own cmake files is referenced --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01459140a76..229ed4a087e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -218,7 +218,7 @@ if(GUI STREQUAL "tiny") add_custom_target(shrink-images ALL COMMAND ${CMAKE_COMMAND} - ARGS -DIMAGE_FILES="${IMAGE_FILES}" -DIMAGE_BUILD_DIR="${IMAGE_BUILD_DIR}" -DIMAGEMAGICK_IDENTIFY_EXECUTABLE="${IMAGEMAGICK_IDENTIFY_EXECUTABLE}" -DIMAGEMAGICK_CONVERT_EXECUTABLE="${IMAGEMAGICK_CONVERT_EXECUTABLE}" -P "${CMAKE_SOURCE_DIR}/cmake/ShrinkImages.cmake" + ARGS -DIMAGE_FILES="${IMAGE_FILES}" -DIMAGE_BUILD_DIR="${IMAGE_BUILD_DIR}" -DIMAGEMAGICK_IDENTIFY_EXECUTABLE="${IMAGEMAGICK_IDENTIFY_EXECUTABLE}" -DIMAGEMAGICK_CONVERT_EXECUTABLE="${IMAGEMAGICK_CONVERT_EXECUTABLE}" -P "${CMAKE_MODULE_PATH}/ShrinkImages.cmake" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Creating resized images for tinygui.") @@ -255,7 +255,7 @@ endif() # configure_file( - "${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" + "${CMAKE_MODULE_PATH}/uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake" IMMEDIATE @ONLY) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fed1e99dfeb..a996ed2b2e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -87,7 +87,7 @@ if(SVNVERSION_EXECUTABLE) add_custom_target(revision-stamp ALL COMMAND ${CMAKE_COMMAND} -DSVNVERSION_EXECUTABLE="${SVNVERSION_EXECUTABLE}" -DSRC_DIR="${CMAKE_SOURCE_DIR}" - -P "${CMAKE_SOURCE_DIR}/cmake/revision.cmake" + -P "${CMAKE_MODULE_PATH}/revision.cmake" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Updating revision")