[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/office
From:       Laurent Montel <montel () kde ! org>
Date:       2009-07-20 22:25:42
Message-ID: 1248128742.181026.3062.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1000148 by mlaurent:

Fix search module


 M  +1 -2      CMakeLists.txt  
 M  +2 -2      kmymoney/CMakeLists.txt  


--- trunk/playground/office/CMakeLists.txt #1000147:1000148
@@ -1,7 +1,6 @@
 project(playground-office)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules \
                )
-
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/kmymoney/cmake/modules \
${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )  find_package(KDE4 \
REQUIRED)  include (KDE4Defaults)
 
--- trunk/playground/office/kmymoney/CMakeLists.txt #1000147:1000148
@@ -10,7 +10,7 @@
 endif(COMMAND cmake_policy)
 
 # Our modules reside in the subdirectory cmake/modules/
-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 ######################### KMyMoney Version ##########################
 
@@ -21,7 +21,7 @@
 
 # Get the date of the last change from the ChangeLog
 SET(date_format "([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])")
-FILE(STRINGS ${CMAKE_SOURCE_DIR}/ChangeLog LAST_CHANGE
+FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog LAST_CHANGE
   REGEX ${date_format} LIMIT_COUNT 1 LENGTH_MINIMUM 10 LENGTH_MAXIMUM 10)
 STRING(REGEX MATCH ${date_format} _ign "${LAST_CHANGE}")
 SET(VERSION_SUFFIX "svn${CMAKE_MATCH_1}${CMAKE_MATCH_2}${CMAKE_MATCH_3}")


[prev in list] [next in list] [prev in thread] [next in thread]