Page MenuHomePhorge
Files F16570284

No OneTemporary
Actions

View Options

diff --git a/experimental/libkdeclarative/CMakeLists.txt b/experimental/libkdeclarative/CMakeLists.txt
index 8e6b301555..ac21ea333a 100644
--- a/experimental/libkdeclarative/CMakeLists.txt
+++ b/experimental/libkdeclarative/CMakeLists.txt
@@ -1,54 +1,55 @@
project(kdeclarative)
if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(KDECLARATIVE_NO_KIO TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdeclarative.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdeclarative.h)
include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_KIO_INCLUDES}
${CMAKE_SOURCE_DIR}/kio
)
if(BUILDING_EXPERIMENTAL_SEPARATELY)
include_directories(${KDE4_INCLUDES})
endif()
set(kdeclarative_LIB_SRCS
kdeclarative.cpp
private/engineaccess.cpp
private/kiconprovider.cpp
bindings/qscriptnonguibookkeeping.cpp
bindings/i18n.cpp
bindings/icon.cpp
bindings/url.cpp)
kde4_add_library(kdeclarative SHARED ${kdeclarative_LIB_SRCS})
+generate_export_header(kdeclarative)
set_target_properties(kdeclarative PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION})
target_link_libraries(kdeclarative ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} kcoreaddons)
## test
set(kdeclarative_TEST_SRCS
test/test.cpp)
kde4_add_executable(kdeclarativetest ${kdeclarative_TEST_SRCS})
target_link_libraries(kdeclarativetest kdeclarative ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY})
## install
set(kdeclarative_LIB_HEADERS
kdeclarative.h
- kdeclarative_export.h)
+ ${CMAKE_CURRENT_BINARY_DIR}/kdeclarative_export.h)
install(FILES ${kdeclarative_LIB_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/ COMPONENT Devel)
install(TARGETS kdeclarative ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/experimental/libkdeclarative/kdeclarative_export.h b/experimental/libkdeclarative/kdeclarative_export.h
deleted file mode 100644
index 670dfc0d15..0000000000
--- a/experimental/libkdeclarative/kdeclarative_export.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* This file is part of the KDE project
- Copyright 2007 Aaron Seigo <aseigo@kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef KDECLARATIVE_EXPORT_H
-#define KDECLARATIVE_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef KDECLARATIVE_EXPORT
-# if defined(KDELIBS_STATIC_LIBS)
- /* No export/import for static libraries */
-# define KDECLARATIVE_EXPORT
-# elif defined(MAKE_KDECLARATIVE_LIB)
- /* We are building this library */
-# define KDECLARATIVE_EXPORT KDE_EXPORT
-# else
- /* We are using this library */
-# define KDECLARATIVE_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef KDECLARATIVE_EXPORT_DEPRECATED
-# define KDECLARATIVE_EXPORT_DEPRECATED KDE_DEPRECATED KDECLARATIVE_EXPORT
-# endif
-
-#endif

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 1, 9:13 AM (1 d, 12 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
10075632
Default Alt Text
(3 KB)

Event Timeline