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

List:       kde-artists
Subject:    [kde-artists] KDE/kdelibs
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2007-03-08 16:49:29
Message-ID: 1173372569.717291.28324.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 640627 by neundorf:

quick fix to unbreak compilation with cmake 2.4.3, which is still the required \
version

Alex



 M  +2 -1      CMakeLists.txt  
 M  +13 -3     pics/oxygen/CMakeLists.txt  


--- trunk/KDE/kdelibs/CMakeLists.txt #640626:640627
@@ -7,8 +7,9 @@
 
 find_package(KDE4Internal REQUIRED)
 find_package(ZLIB REQUIRED)
+
 if(NOT WIN32)
-	find_package(Strigi REQUIRED)
+   find_package(Strigi REQUIRED)
 endif(NOT WIN32)
 
 if (APPLE)
--- trunk/KDE/kdelibs/pics/oxygen/CMakeLists.txt #640626:640627
@@ -1,9 +1,19 @@
 
 ########### install files ###############
-set(oxygen_icon_dirs 128x128  16x16  22x22  32x32  48x48 64x64 scalable)
 
-install( DIRECTORY ${oxygen_icon_dirs} DESTINATION ${ICON_INSTALL_DIR}/oxygen \
                PATTERN .svn EXCLUDE )
-install( FILES index.theme DESTINATION ${ICON_INSTALL_DIR}/oxygen )
+math(EXPR cmake_version "${CMAKE_MAJOR_VERSION} * 10000 + ${CMAKE_MINOR_VERSION} * \
100 + ${CMAKE_PATCH_VERSION}")  
+if (cmake_version GREATER 20403)
 
+   set(oxygen_icon_dirs 128x128  16x16  22x22  32x32  48x48 64x64 scalable)
 
+   install( DIRECTORY ${oxygen_icon_dirs} DESTINATION ${ICON_INSTALL_DIR}/oxygen \
PATTERN .svn EXCLUDE ) +   install( FILES index.theme DESTINATION \
${ICON_INSTALL_DIR}/oxygen ) +
+else (cmake_version GREATER 20403)
+
+   message(STATUS "Oxygen icons temporarily disabled, because right CMake >= 2.4.5 \
is required to install them") +
+endif (cmake_version GREATER 20403)
+
+
______________________________________________________________________________
kde-artists@kde.org |  https://mail.kde.org/mailman/listinfo/kde-artists


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