Author: ivanovic
Date: Mon Jul 14 19:46:42 2008
New Revision: 28031
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28031&view=rev
Log:
use the CMAKE_MODULE_PATH when the folder with our own cmake files is referenced
Modified:
trunk/CMakeLists.txt
trunk/src/CMakeLists.txt
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=28031&r1=28030&r2=28031&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Mon Jul 14 19:46:42 2008
@@ -218,7 +218,7 @@
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 @@
#
configure_file(
- "${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in"
+ "${CMAKE_MODULE_PATH}/uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/uninstall.cmake"
IMMEDIATE @ONLY)
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=28031&r1=28030&r2=28031&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Mon Jul 14 19:46:42 2008
@@ -87,7 +87,7 @@
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")
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
