aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2017-02-04 18:46:24 +0100
committerDavid Faure <faure@kde.org>2017-02-04 18:46:24 +0100
commit3cb4c615990b52d40564281a862b4e5a19fc7a1c (patch)
treeafe57b95745bee78db23e1facf55904b43ac2e2f
parent36e17c3d1c6a2b6af6cb7bb7330cb34b459b25fd (diff)
downloadkconfig-3cb4c615990b52d40564281a862b4e5a19fc7a1c.tar.gz
kconfig-3cb4c615990b52d40564281a862b4e5a19fc7a1c.tar.bz2
Fix linking on Windows: don't link kentrymaptest to KConfigCore.
It's not needed, this is purely a test for the standalone KEntryMap class.
-rw-r--r--autotests/CMakeLists.txt3
-rw-r--r--src/core/kconfigdata.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 96c7b65e..c1ae1de0 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -20,8 +20,9 @@ endif()
set(kentrymaptest_SRCS kentrymaptest.cpp ../src/core/kconfigdata.cpp)
ecm_add_test(${kentrymaptest_SRCS}
TEST_NAME kentrymaptest
- LINK_LIBRARIES KF5::ConfigCore Qt5::Test
+ LINK_LIBRARIES Qt5::Test
)
+target_include_directories(kentrymaptest PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src/core)
# compile KConfigUtils into the test since it's not exported
set(test_kconfigutils_SRCS test_kconfigutils ../src/kconf_update/kconfigutils.cpp)
diff --git a/src/core/kconfigdata.h b/src/core/kconfigdata.h
index a2430169..e33cfd27 100644
--- a/src/core/kconfigdata.h
+++ b/src/core/kconfigdata.h
@@ -23,8 +23,6 @@
#ifndef KCONFIGDATA_H
#define KCONFIGDATA_H
-#include <kconfigcore_export.h>
-
#include <QtCore/QByteArray>
#include <QtCore/QString>
#include <QtCore/QMap>