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

List:       kde-commits
Subject:    [libkipi/development/2.0.0] tests: use local kipi header, not system one
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2012-06-21 15:17:09
Message-ID: 20120621151709.99537A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 2b5dc142f3af38b2412b1c6e3c4da7d1fa1b12c8 by Gilles Caulier.
Committed on 21/06/2012 at 17:16.
Pushed by cgilles into branch 'development/2.0.0'.

use local kipi header, not system one

M  +3    -1    tests/CMakeLists.txt
M  +1    -1    tests/kipiimagecollectionselector.cpp
M  +1    -1    tests/kipiimagecollectionselector.h
M  +1    -1    tests/kipiimagecollectionshared.h
M  +1    -1    tests/kipiimageinfoshared.h
M  +2    -2    tests/kipiinterface.cpp
M  +1    -1    tests/kipiinterface.h
M  +1    -1    tests/kipitestpluginloader.cpp
M  +1    -1    tests/kipitestpluginloader.h
M  +1    -1    tests/kipiuploadwidget.cpp
M  +1    -1    tests/kipiuploadwidget.h
M  +1    -1    tests/main.cpp

http://commits.kde.org/libkipi/2b5dc142f3af38b2412b1c6e3c4da7d1fa1b12c8

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c7b85a2..17329b8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,7 +24,9 @@
 #
 # ============================================================
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../libkipi)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../libkipi
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../libkipi
+                   )
 
 SET(kxmlkipicmd_SRCS
     kipiinterface.cpp
diff --git a/tests/kipiimagecollectionselector.cpp b/tests/kipiimagecollectionselector.cpp
index d8271f3..b15c99b 100644
--- a/tests/kipiimagecollectionselector.cpp
+++ b/tests/kipiimagecollectionselector.cpp
@@ -37,7 +37,7 @@
 
 // LibKIPI includes
 
-#include <libkipi/imagecollection.h>
+#include "imagecollection.h"
 
 // local includes:
 
diff --git a/tests/kipiimagecollectionselector.h b/tests/kipiimagecollectionselector.h
index 65d0f22..1d55844 100644
--- a/tests/kipiimagecollectionselector.h
+++ b/tests/kipiimagecollectionselector.h
@@ -27,7 +27,7 @@
 
 // libkipi includes
 
-#include <libkipi/imagecollectionselector.h>
+#include "imagecollectionselector.h"
 
 class QListWidget;
 
diff --git a/tests/kipiimagecollectionshared.h b/tests/kipiimagecollectionshared.h
index 58a858f..3880f96 100644
--- a/tests/kipiimagecollectionshared.h
+++ b/tests/kipiimagecollectionshared.h
@@ -27,7 +27,7 @@
 
 // libkipi includes
 
-#include <libkipi/imagecollectionshared.h>
+#include "imagecollectionshared.h"
 
 namespace KXMLKipiCmd
 {
diff --git a/tests/kipiimageinfoshared.h b/tests/kipiimageinfoshared.h
index 1d719e1..6b8b5ab 100644
--- a/tests/kipiimageinfoshared.h
+++ b/tests/kipiimageinfoshared.h
@@ -29,7 +29,7 @@
 
 // libkipi includes
 
-#include <libkipi/imageinfoshared.h>
+#include "imageinfoshared.h"
 
 using namespace KIPI;
 
diff --git a/tests/kipiinterface.cpp b/tests/kipiinterface.cpp
index 6196476..5642c4c 100644
--- a/tests/kipiinterface.cpp
+++ b/tests/kipiinterface.cpp
@@ -40,8 +40,8 @@
 
 // LibKIPI includes
 
-#include <libkipi/version.h>
-#include <libkipi/imagecollection.h>
+#include "version.h"
+#include "imagecollection.h"
 
 // local includes
 
diff --git a/tests/kipiinterface.h b/tests/kipiinterface.h
index 7743727..48ed25e 100644
--- a/tests/kipiinterface.h
+++ b/tests/kipiinterface.h
@@ -29,7 +29,7 @@
 
 // LibKIPI includes
 
-#include <libkipi/interface.h>
+#include "interface.h"
 
 class KFileItem;
 
diff --git a/tests/kipitestpluginloader.cpp b/tests/kipitestpluginloader.cpp
index 8fb4ae4..b371d09 100644
--- a/tests/kipitestpluginloader.cpp
+++ b/tests/kipitestpluginloader.cpp
@@ -39,7 +39,7 @@
 
 // LibKIPI includes
 
-#include <libkipi/pluginloader.h>
+#include "pluginloader.h"
 
 // Local includes
 
diff --git a/tests/kipitestpluginloader.h b/tests/kipitestpluginloader.h
index 1200c04..7ffdb23 100644
--- a/tests/kipitestpluginloader.h
+++ b/tests/kipitestpluginloader.h
@@ -33,7 +33,7 @@
 
 // Libkipi includes
 
-#include <libkipi/plugin.h>
+#include "plugin.h"
 
 class QAction;
 
diff --git a/tests/kipiuploadwidget.cpp b/tests/kipiuploadwidget.cpp
index c1db904..407a826 100644
--- a/tests/kipiuploadwidget.cpp
+++ b/tests/kipiuploadwidget.cpp
@@ -37,7 +37,7 @@
 
 // LibKIPI includes
 
-#include <libkipi/imagecollection.h>
+#include "imagecollection.h"
 
 // local includes
 
diff --git a/tests/kipiuploadwidget.h b/tests/kipiuploadwidget.h
index d6ecf71..9ae9673 100644
--- a/tests/kipiuploadwidget.h
+++ b/tests/kipiuploadwidget.h
@@ -27,7 +27,7 @@
 
 // libkipi includes
 
-#include <libkipi/uploadwidget.h>
+#include "uploadwidget.h"
 
 class QListWidget;
 
diff --git a/tests/main.cpp b/tests/main.cpp
index 0e9ee83..f055f06 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -36,7 +36,7 @@
 
 // LibKipi includes
 
-#include <libkipi/version.h>
+#include "version.h"
 
 // local includes:
 
[prev in list] [next in list] [prev in thread] [next in thread]