summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <arichardson.kde@gmail.com>2015-04-15 23:54:32 (GMT)
committerAlex Richardson <arichardson.kde@gmail.com>2015-04-15 23:54:32 (GMT)
commitdcf4d93abb79b3f8c38f32a4d1e32e672e2dff4c (patch)
tree83308558fc6bbf1cc2333f4a36e6ae8c7553ef67
parentac258e49f1d7efe5fe950776ce334a9107923b07 (diff)
Fix the export header not being found in interfaces/*.h
REVIEW: 123363
-rw-r--r--CMakeLists.txt6
-rw-r--r--interfaces/configinterface.h2
-rw-r--r--interfaces/guiinterface.h2
-rw-r--r--interfaces/printinterface.h2
-rw-r--r--interfaces/saveinterface.h2
-rw-r--r--interfaces/viewerinterface.h2
6 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 836b191..3b882f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ set_package_properties("LibKScreen" PROPERTIES
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
add_definitions(-DTRANSLATION_DOMAIN="okular")
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${PHONON_INCLUDES} core/synctex ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}/core)
add_subdirectory( active )
add_subdirectory( ui )
@@ -164,7 +164,7 @@ install( FILES
core/fileprinter.h
core/observer.h
${CMAKE_CURRENT_BINARY_DIR}/core/version.h
- ${CMAKE_CURRENT_BINARY_DIR}/okularcore_export.h
+ ${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h
${CMAKE_CURRENT_BINARY_DIR}/settings_core.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/core COMPONENT Devel)
@@ -183,7 +183,7 @@ ki18n_wrap_ui(okularcore_SRCS
kconfig_add_kcfg_files(okularcore_SRCS conf/settings_core.kcfgc )
add_library(okularcore SHARED ${okularcore_SRCS})
-generate_export_header(okularcore BASE_NAME okularcore)
+generate_export_header(okularcore BASE_NAME okularcore EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h")
# Special handling for linking okularcore on OSX/Apple
IF(APPLE)
diff --git a/interfaces/configinterface.h b/interfaces/configinterface.h
index d5e6433..1f4cdc9 100644
--- a/interfaces/configinterface.h
+++ b/interfaces/configinterface.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_CONFIGINTERFACE_H_
#define _OKULAR_CONFIGINTERFACE_H_
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
#include <QtCore/QObject>
diff --git a/interfaces/guiinterface.h b/interfaces/guiinterface.h
index 4b4dca0..deb0769 100644
--- a/interfaces/guiinterface.h
+++ b/interfaces/guiinterface.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_GUIINTERFACE_H_
#define _OKULAR_GUIINTERFACE_H_
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
#include <QtCore/QObject>
diff --git a/interfaces/printinterface.h b/interfaces/printinterface.h
index 460d33e..919a0d7 100644
--- a/interfaces/printinterface.h
+++ b/interfaces/printinterface.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_PRINTINTERFACE_H_
#define _OKULAR_PRINTINTERFACE_H_
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
#include <QtCore/QObject>
diff --git a/interfaces/saveinterface.h b/interfaces/saveinterface.h
index 8ae1bea..95e7ccb 100644
--- a/interfaces/saveinterface.h
+++ b/interfaces/saveinterface.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_SAVEINTERFACE_H_
#define _OKULAR_SAVEINTERFACE_H_
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
#include <QtCore/QObject>
diff --git a/interfaces/viewerinterface.h b/interfaces/viewerinterface.h
index c174059..7245497 100644
--- a/interfaces/viewerinterface.h
+++ b/interfaces/viewerinterface.h
@@ -10,7 +10,7 @@
#ifndef _OKULAR_VIEWERINTERFACE_H_
#define _OKULAR_VIEWERINTERFACE_H_
-#include "okularcore_export.h"
+#include "../core/okularcore_export.h"
#include <QtCore/QObject>
#include <QtCore/QString>