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

List:       kde-commits
Subject:    playground/libs/webkitkde
From:       Laurent Montel <montel () kde ! org>
Date:       2009-04-16 11:39:16
Message-ID: 1239881956.143749.20167.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 954799 by mlaurent:

My cmake doesn't like (NOT (... AND...))


 M  +3 -2      CMakeLists.txt  
 M  +6 -4      kdewebkit/CMakeLists.txt  


--- trunk/playground/libs/webkitkde/CMakeLists.txt #954798:954799
@@ -9,10 +9,11 @@
     ${CMAKE_SOURCE_DIR}/kdewebkit/cmake/modules
     ${CMAKE_SOURCE_DIR}/part/cmake/modules)
 
-if(NOT (${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69"))
+if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")	
     set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} \
${CMAKE_SOURCE_DIR}/kdenetwork/cmake/modules)  add_subdirectory(kdenetwork)
-endif(NOT (${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69"))
+endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
 
 add_subdirectory(icons)
 add_subdirectory(kdewebkit)
--- trunk/playground/libs/webkitkde/kdewebkit/CMakeLists.txt #954798:954799
@@ -5,12 +5,13 @@
 include(KDE4Defaults)
 include(MacroLibrary)
 
-if(NOT (${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69"))
+if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
     # QtWebKit uses QtNetwork, to KdeWebKit uses....
     # Starting from kdelibs 4.2.70, KIO does contain the network part.
     find_package(KdeNetwork REQUIRED)
     include_directories(${KDENETWORK_INCLUDE_DIR})
-endif(NOT (${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69"))
+endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
 
 include_directories(${KDE4_INCLUDES} ${CMAKE_SOURCE_DIR})
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
@@ -40,9 +41,10 @@
     ${QT_QTXML_LIBRARY}
 )
 
-if(NOT (${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69"))
+if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
+else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
     target_link_libraries(kdewebkit ${KDENETWORK_LIBRARIES})
-endif(NOT (${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69"))
+endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69")
 
 #set_target_properties(kdewebkit PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION})  set_target_properties(kdewebkit PROPERTIES VERSION 1.0.0 \
SOVERSION 1) # for the moment keep something low...


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