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

List:       kde-commits
Subject:    KDE/kdebase/runtime/solid-networkstatus/kded
From:       Stefan Böhmann <kde () hilefoks ! org>
Date:       2010-09-16 13:06:52
Message-ID: 20100916130652.0AD59AC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1176032 by sboehmann:

Fix build when the optional NetworkManager was not found. 

MACRO_ENSURE_VERSION was invoked with a incorrect number of arguments because the \
${NETWORKMANAGER_VERSION} is empty if NetworkManager wasn't found at all.

CCMAIL: ervin@kde.org



 M  +5 -4      CMakeLists.txt  


--- trunk/KDE/kdebase/runtime/solid-networkstatus/kded/CMakeLists.txt \
#1176031:1176032 @@ -7,15 +7,16 @@
 )
 
 macro_optional_find_package(NetworkManager)
+
+if(NETWORKMANAGER_FOUND)
 macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
-
-if(NETWORKMANAGER_FOUND AND NM_0_7)
+    if(NM_0_7)
     MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
-
     set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} \
networkmanagerstatus.cpp)  include_directories(${NETWORKMANAGER_INCLUDE_DIRS})
     add_definitions(-DNM_BACKEND_ENABLED)
-endif(NETWORKMANAGER_FOUND AND NM_0_7)
+    endif(NM_0_7)
+endif(NETWORKMANAGER_FOUND)
 
 qt4_add_dbus_adaptor(kded_networkstatus_PART_SRCS \
../org.kde.Solid.Networking.Service.xml  networkstatus.h NetworkStatusModule)


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