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

List:       kde-commits
Subject:    [libnm-qt] /: Support CMAKE_INCLUDE_PATH variable and stop
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2011-11-19 20:25:58
Message-ID: 20111119202558.E7168A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 0f2cf729374be9a84a004212fcc4feb29706dfe9 by Lamarque V. Souza.
Committed on 19/11/2011 at 21:23.
Pushed by lvsouza into branch 'master'.

Support CMAKE_INCLUDE_PATH variable and stop CMakeLists.txt processing
if libmm-qt is not found.

CCMAIL: schwarzer@kde.org

M  +3    -4    CMakeLists.txt

http://commits.kde.org/libnm-qt/0f2cf729374be9a84a004212fcc4feb29706dfe9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e005a4e..201cb6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(NetworkManager REQUIRED)
 =

 add_definitions(${QT_DEFINITIONS})
 =

-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES}=
 ${CMAKE_INCLUDE_PATH})
 =

 include_directories(
    ${NETWORKMANAGER_INCLUDE_DIRS}
@@ -125,10 +125,9 @@ qt4_automoc(${DBUS_INTERFACE_SRCS})
 =

 add_library(nm-qt SHARED ${nmqt_MOC} ${nmqt_PART_SRCS} ${DBUS_INTERFACE_SR=
CS})
 =

-find_file(LIBMM_FOUND libmm-qt/manager.h /usr/include NO_DEFAULT_PATH)
+find_file(LIBMM_FOUND libmm-qt/manager.h /usr/include ${CMAKE_INCLUDE_PATH=
})
 if (NOT LIBMM_FOUND)
-    message("ERROR: libmm-qt not found")
-    return()
+    message(FATAL_ERROR "ERROR: libmm-qt not found")
 endif (NOT LIBMM_FOUND)
 =

 # TODO: dlopen libmm-qt to make it a runtime dependency instead of compile
[prev in list] [next in list] [prev in thread] [next in thread]