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

List:       kde-commits
Subject:    KDE
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2008-12-14 23:11:35
Message-ID: 1229296295.965201.18081.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 896999 by neundorf:

-rename the new kde4_write_basic_cmake_version_file() to \
macro_write_basic_cmake_version_file(), since  it is completely KDE-independent and \
can potentially be used in any other project remove the old macro, add the new \
renamed one, add it to the macro library, adjust kdepimlibs/CMakeLists.txt \
accordingly

Alex




 AM            kdelibs/cmake/modules/BasicFindPackageVersion.cmake.in  
 M  +2 -2      kdelibs/cmake/modules/CMakeLists.txt  
 M  +0 -8      kdelibs/cmake/modules/FindKDE4Internal.cmake  
 M  +0 -8      kdelibs/cmake/modules/KDE4Macros.cmake  
 M  +1 -0      kdelibs/cmake/modules/MacroLibrary.cmake  
 AM            kdelibs/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake  
 D             kdelibs/cmake/modules/kde4BasicFindPackageVersion.cmake.in  
 M  +3 -3      kdepimlibs/CMakeLists.txt  


** trunk/KDE/kdelibs/cmake/modules/BasicFindPackageVersion.cmake.in #property \
svn:eol-style  + native
--- trunk/KDE/kdelibs/cmake/modules/CMakeLists.txt #896998:896999
@@ -1,4 +1,4 @@
-## install the cmake files
+# install the cmake files
 
 file(GLOB cmakeFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.cmake")
 
@@ -9,7 +9,7 @@
                kde4init_win32lib_dummy.cpp.in 
                kde4_cmake_uninstall.cmake.in 
                kde4automoc.files.in 
-               kde4BasicFindPackageVersion.cmake.in
+               BasicFindPackageVersion.cmake.in
                FindLibPython.py
                FindPyKDE4.py
                FindPyQt.py
--- trunk/KDE/kdelibs/cmake/modules/FindKDE4Internal.cmake #896998:896999
@@ -134,14 +134,6 @@
 #    Use this to add widget description files for the makekdewidgets code generator
 #    for Qt Designer plugins.
 #
-#  KDE4_WRITE_BASIC_CMAKE_VERSION_FILE( _filename _major _minor _patch)
-#    Writes a file for use as <package>ConfigVersion.cmake file to <_filename>.
-#    See the documentation of FIND_PACKAGE() for details on this.
-#    _filename is the output filename, it should be in the build tree.
-#    _major is the major version number of the project to be installed
-#    _minor is the minor version number of the project to be installed
-#    _patch is the patch version number of the project to be installed
-#
 #  KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
 #    This macro is intended mainly for internal uses.
 #    It is used for enable-final. It will generate two source files,
--- trunk/KDE/kdelibs/cmake/modules/KDE4Macros.cmake #896998:896999
@@ -1134,14 +1134,6 @@
 endmacro (KDE4_ADD_APP_ICON)
 
 
-function(KDE4_WRITE_BASIC_CMAKE_VERSION_FILE _filename _major _minor _patch)
-   set(PROJECT_VERSION_MAJOR ${_major})
-   set(PROJECT_VERSION_MINOR ${_minor})
-   set(PROJECT_VERSION_PATCH ${_patch})
-   configure_file(${KDE4_MODULE_DIR}/kde4BasicFindPackageVersion.cmake.in \
                "${_filename}" @ONLY)
-endfunction(KDE4_WRITE_BASIC_CMAKE_VERSION_FILE _major _minor _patch)
-
-
 macro(_KDE4_EXPORT_LIBRARY_DEPENDENCIES _append_or_write _filename)
    message(FATAL_ERROR "_KDE4_EXPORT_LIBRARY_DEPENDENCIES() was an internal macro \
and has been removed again. Just remove the code which calls it, there is no \
substitute.")  endmacro(_KDE4_EXPORT_LIBRARY_DEPENDENCIES)
--- trunk/KDE/kdelibs/cmake/modules/MacroLibrary.cmake #896998:896999
@@ -16,3 +16,4 @@
 INCLUDE(MacroBoolTo01)
 INCLUDE(MacroPushRequiredVars)
 INCLUDE(MacroLogFeature)
+INCLUDE(MacroWriteBasicCMakeVersionFile)
** trunk/KDE/kdelibs/cmake/modules/MacroWriteBasicCMakeVersionFile.cmake #property \
svn:eol-style  + native
--- trunk/KDE/kdepimlibs/CMakeLists.txt #896998:896999
@@ -134,12 +134,12 @@
         DESTINATION ${_KdepimLibsConfig_INSTALL_DIR} )
 
 # this requires kdelibs >= Dec. 15th, will remove the test soon, Alex
-if(COMMAND KDE4_WRITE_BASIC_CMAKE_VERSION_FILE)
-   kde4_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake \
 +if(COMMAND MACRO_WRITE_BASIC_CMAKE_VERSION_FILE)
+   macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake \
                
                                   ${KDEPIMLIBS_VERSION_MAJOR} \
${KDEPIMLIBS_VERSION_MINOR} ${KDEPIMLIBS_VERSION_PATCH})  install(FILES \
${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake  DESTINATION \
                ${_KdepimLibsConfig_INSTALL_DIR} )
-endif(COMMAND KDE4_WRITE_BASIC_CMAKE_VERSION_FILE)
+endif(COMMAND MACRO_WRITE_BASIC_CMAKE_VERSION_FILE)
 
 # from next monday on only the version with prefix will be installed, to keep it \
working  # in all cases until then now install two versions, one with and one without \
prefix. Alex


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