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

List:       kde-commits
Subject:    kdesupport
From:       Michel Hermier <michel.hermier () gmail ! com>
Date:       2008-07-18 23:20:47
Message-ID: 1216423247.471838.982.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 834451 by hermier:

Revert 834172 so that automoc4 is found at the correct place.

 M  +1 -1      akonadi/cmake/modules/FindAutomoc4.cmake  
 M  +1 -1      phonon/cmake/FindAutomoc4.cmake  


--- trunk/kdesupport/akonadi/cmake/modules/FindAutomoc4.cmake #834450:834451
@@ -20,7 +20,7 @@
 # check if we are inside KDESupport and automoc is enabled
 if("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    # when building this project as part of kdesupport
-   set(AUTOMOC4_CONFIG_FILE "${KDESupport_BINARY_DIR}/automoc/Automoc4Config.cmake")
+   set(AUTOMOC4_CONFIG_FILE "${KDESupport_SOURCE_DIR}/automoc/Automoc4Config.cmake")
 else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    # when building this project outside kdesupport
 
--- trunk/kdesupport/phonon/cmake/FindAutomoc4.cmake #834450:834451
@@ -20,7 +20,7 @@
 # check if we are inside KDESupport and automoc is enabled
 if("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    # when building this project as part of kdesupport
-   set(AUTOMOC4_CONFIG_FILE "${KDESupport_BINARY_DIR}/automoc/Automoc4Config.cmake")
+   set(AUTOMOC4_CONFIG_FILE "${KDESupport_SOURCE_DIR}/automoc/Automoc4Config.cmake")
 else("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
    # when building this project outside kdesupport
 
[prev in list] [next in list] [prev in thread] [next in thread]