Commit aa50ad4a authored by Boudewijn Rempt's avatar Boudewijn Rempt

move koaction into komain

As discussed and decided in Oslo, koaction is only used in KWord
and KoMain, so can move to komain.

svn path=/trunk/koffice/; revision=1058955
parent 3ca50774
......@@ -252,7 +252,7 @@ configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h
# any other include directory
# for config.h and <toplevel/foo.h> includes (if any?)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/interfaces )
# koaction depends on threadweaver
set(KOACTION_INCLUDES ${CMAKE_SOURCE_DIR}/libs/koaction ${CMAKE_BINARY_DIR}/libs/koaction ${KDE4_INCLUDES})
......
......@@ -18,6 +18,6 @@ install(TARGETS kochart ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
install(FILES koChart.h KoChartInterface.h KoChartModel.h KoTableInterface.h
install(FILES KoGenericRegistry.h KoID.h koChart.h KoChartInterface.h KoChartModel.h KoTableInterface.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
add_subdirectory( tests )
include_directories( ${KOACTION_INCLUDES} )
set(koaction_LIB_SRCS
ActionJob_p.cpp
KoAction.cpp
KoExecutePolicy.cpp
KoJobsListPolicy.cpp
)
kde4_add_library(koaction SHARED ${koaction_LIB_SRCS})
target_link_libraries(koaction
${KDE4_KDECORE_LIBS}
${KDE4_THREADWEAVER_LIBRARIES}
)
#target_link_libraries(koaction LINK_INTERFACE_LIBRARIES)
set_target_properties(koaction PROPERTIES
VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION}
)
install(TARGETS koaction ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES
ActionJob_p.h
KoAction.h
KoExecutePolicy.h
KoExecutePolicy_p.h
KoJobsListPolicy.h
koaction_export.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
/* This file is part of the KDE project
Copyright (C) 2006 David Faure <faure@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 KOACTION_EXPORT_H
#define KOACTION_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <kdemacros.h>
/* We use _WIN32/_WIN64 instead of Q_OS_WIN so that this header can be used from C files too */
#if defined _WIN32 || defined _WIN64
#ifndef KOACTION_EXPORT
# if defined(MAKE_KOACTION_LIB)
/* We are building this library */
# define KOACTION_EXPORT KDE_EXPORT
# else
/* We are using this library */
# define KOACTION_EXPORT KDE_IMPORT
# endif
#endif
#else /* UNIX */
#define KOACTION_EXPORT KDE_EXPORT
#endif
#endif
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories(
${KOACTION_INCLUDES}
${KDE4_INCLUDE_DIR}/threadweaver/
)
########### next target ###############
set(TestAction_SRCS TestAction.cpp )
kde4_add_unit_test(TestAction TESTNAME libs-koaction-threadAction-TestAction ${TestAction_SRCS})
target_link_libraries(TestAction koaction ${KDE4_THREADWEAVER_LIBRARY} ${QT_QTTEST_LIBRARY} )
########### end ###############
......@@ -16,10 +16,3 @@ set_target_properties(koplugin PROPERTIES
)
install(TARGETS koplugin ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES
KoID.h
KoGenericRegistry.h
KoGenericRegistryModel.h
koplugin_export.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
......@@ -78,6 +78,11 @@ set(komain_LIB_SRCS
KoTemplates.cpp
KoTemplatesPane.cpp
KoTemplateTree.cpp
ActionJob_p.cpp
KoAction.cpp
KoExecutePolicy.cpp
KoJobsListPolicy.cpp
)
kde4_add_ui_files( komain_LIB_SRCS
......
......@@ -40,5 +40,11 @@ set(KoProgressUpdater_test_SRCS KoProgressUpdater_test.cpp )
kde4_add_unit_test(KoProgressUpdaterTest TESTNAME libs-komain-KoProgressUpdaterTest ${KoProgressUpdater_test_SRCS})
target_link_libraries(KoProgressUpdaterTest komain ${QT_QTTEST_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES})
########### next target ###############
set(TestAction_test_SRCS TestAction.cpp )
kde4_add_unit_test(TestActionTest TESTNAME libs-komain-TestActionTest ${TestAction_test_SRCS})
target_link_libraries(TestActionTest komain ${QT_QTTEST_LIBRARY} ${KDE4_THREADWEAVER_LIBRARIES})
########### end ###############
......@@ -38,6 +38,7 @@ set_target_properties(kowidgets PROPERTIES
install(TARGETS kowidgets ${INSTALL_TARGETS_DEFAULT_ARGS})
install( FILES
KoGenericRegistryModel.h
KoPageLayoutDialog.h
KoPageLayout.h
KoPageLayoutWidget.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment