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

List:       kde-commits
Subject:    kdesupport/automoc
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2010-06-23 21:09:24
Message-ID: 20100623210924.D09C7AC8DD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1141941 by neundorf:

-add cmake_policy(PUSH|POP) to save and restore the original cmake policy settings
-add the cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) back, since this is indeed required

Alex



 M  +22 -0     Automoc4Config.cmake  


--- trunk/kdesupport/automoc/Automoc4Config.cmake #1141940:1141941
@@ -48,7 +48,17 @@
 #     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 #     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# push the current cmake policy settings on the policy stack and pop them again at the
+# end of this file, so any policies which are changed in this file don't affect anything
+# on the outside (cmake_minimum_required() sets all policies to NEW for version 2.6.4). Alex
+if(COMMAND cmake_policy)
+  cmake_policy(PUSH)
+endif(COMMAND cmake_policy)
 
+# 2.6.4 is required because of the get_filename_component(REALPATH)
+cmake_minimum_required( VERSION 2.6.4 FATAL_ERROR )
+
+
 get_filename_component(_AUTOMOC4_CURRENT_DIR  "${CMAKE_CURRENT_LIST_FILE}" PATH)
 
 # set the automoc version number
@@ -62,6 +72,9 @@
 else(EXISTS ${_AUTOMOC4_CURRENT_DIR}/kde4automoc.cpp)
    get_filename_component(_AUTOMOC4_BIN_DIR  "${_AUTOMOC4_CURRENT_DIR}" PATH)
    get_filename_component(_AUTOMOC4_BIN_DIR  "${_AUTOMOC4_BIN_DIR}" PATH)
+
+   # This REALPATH here is necessary for the case that the path is a "virtual" drive 
+   # created using "subst", in this case otherwise the drive letter is missing:
    if(WIN32)
       get_filename_component(_AUTOMOC4_BIN_DIR  "${_AUTOMOC4_BIN_DIR}" REALPATH)
    endif(WIN32)
@@ -139,6 +152,7 @@
    endif(_moc_files)
 endmacro(AUTOMOC4)
 
+
 macro(_ADD_AUTOMOC4_TARGET _target_NAME _SRCS)
    set(_moc_files)
    set(_moc_headers)
@@ -208,6 +222,7 @@
    endif(_moc_files)
 endmacro(_ADD_AUTOMOC4_TARGET)
 
+
 macro(AUTOMOC4_ADD_EXECUTABLE _target_NAME)
    set(_SRCS ${ARGN})
 
@@ -226,6 +241,7 @@
 
 endmacro(AUTOMOC4_ADD_EXECUTABLE)
 
+
 macro(AUTOMOC4_ADD_LIBRARY _target_NAME)
    set(_SRCS ${ARGN})
 
@@ -252,3 +268,9 @@
 macro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING _target)
    add_dependencies(${_target} "${_target}_automoc")
 endmacro(_AUTOMOC4_KDE4_POST_TARGET_HANDLING)
+
+
+# restore previous policy settings:
+if(COMMAND cmake_policy)
+  cmake_policy(POP)
+endif(COMMAND cmake_policy)
[prev in list] [next in list] [prev in thread] [next in thread]