kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix exports and linkage, remove sources from tests which are already being linked.

Browse source 
REVIEW: 127709
This commit is contained in:
Andrius da Costa Ribas 2016-04-22 14:20:56 -03:00
parent 8b9811694d
commit c6d4cae263
4 changed files with 9 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/CMakeLists.txt
View file

@ -23,8 +23,7 @@ set(dolphinvcs_LIB_SRCS
)
add_library(dolphinvcs ${dolphinvcs_LIB_SRCS})
generate_export_header(dolphinvcs BASE_NAME dolphin)
generate_export_header(dolphinvcs BASE_NAME dolphinvcs)
target_link_libraries(
dolphinvcs PUBLIC
@ -48,7 +47,7 @@ ecm_generate_headers(dolphinvcs_LIB_HEADERS
install(TARGETS dolphinvcs EXPORT DolphinVcsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES views/versioncontrol/fileviewversioncontrolplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
install(FILES ${dolphinvcs_LIB_HEADERS} DESTINATION "${KDE_INSTALL_INCLUDEDIR}/Dolphin" COMPONENT Devel)
########### next target ###############
@ -131,6 +130,7 @@ kconfig_add_kcfg_files(dolphinprivate_LIB_SRCS GENERATE_MOC
)
add_library(dolphinprivate ${dolphinprivate_LIB_SRCS})
generate_export_header(dolphinprivate BASE_NAME dolphin)
target_link_libraries(
dolphinprivate PUBLIC
@ -170,6 +170,7 @@ set_target_properties(dolphinprivate PROPERTIES
)
install(TARGETS dolphinprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolphin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel)
##########################################

4
src/kitemviews/kitemset.h
View file

@ -20,6 +20,8 @@
#ifndef KITEMSET_H
#define KITEMSET_H
#include "dolphin_export.h"
#include <kitemviews/kitemrange.h>
/**
@ -40,7 +42,7 @@
* The complexity of most operations depends on the number of ranges.
*/
class KItemSet
class DOLPHIN_EXPORT KItemSet
{
public:
KItemSet();

35
src/tests/CMakeLists.txt
View file

@ -9,7 +9,6 @@ add_definitions(-DDOLPHIN_EXPORT=)
# KItemSetTest
set(kitemsettest_SRCS
kitemsettest.cpp
../kitemviews/kitemset.cpp
)
add_executable(kitemsettest ${kitemsettest_SRCS})
@ -31,9 +30,6 @@ target_link_libraries(kitemrangetest dolphinprivate Qt5::Test)
# KItemListSelectionManagerTest
set(kitemlistselectionmanagertest_SRCS
kitemlistselectionmanagertest.cpp
../kitemviews/kitemlistselectionmanager.cpp
../kitemviews/kitemmodelbase.cpp
../kitemviews/kitemset.cpp
)
add_executable(kitemlistselectionmanagertest ${kitemlistselectionmanagertest_SRCS})
@ -45,17 +41,6 @@ target_link_libraries(kitemlistselectionmanagertest dolphinprivate Qt5::Test)
set(kitemlistcontrollertest_SRCS
kitemlistcontrollertest.cpp
testdir.cpp
../kitemviews/kfileitemmodel.cpp
../kitemviews/kfileitemlistview.cpp
../kitemviews/kfileitemlistwidget.cpp
../kitemviews/kitemmodelbase.cpp
../kitemviews/kitemlistview.cpp
../kitemviews/kitemlistcontainer.cpp
../kitemviews/kitemlistwidget.cpp
../kitemviews/kitemlistviewaccessible.cpp
../kitemviews/kitemset.cpp
../kitemviews/kstandarditemlistview.cpp
../kitemviews/kstandarditemlistwidget.cpp
../dolphindebug.cpp
)
@ -72,16 +57,6 @@ target_link_libraries(kitemlistcontrollertest dolphinprivate Qt5::Test)
set(kfileitemlistviewtest_SRCS
kfileitemlistviewtest.cpp
testdir.cpp
../kitemviews/kfileitemmodel.cpp
../kitemviews/kfileitemlistview.cpp
../kitemviews/kitemmodelbase.cpp
../kitemviews/kitemlistview.cpp
../kitemviews/kitemlistviewaccessible.cpp
../kitemviews/kitemlistcontainer.cpp
../kitemviews/kitemlistwidget.cpp
../kitemviews/kitemset.cpp
../kitemviews/kstandarditemlistview.cpp
../kitemviews/kstandarditemlistwidget.cpp
../dolphindebug.cpp
)
@ -98,9 +73,6 @@ target_link_libraries(kfileitemlistviewtest dolphinprivate Qt5::Test)
set(kfileitemmodeltest_SRCS
kfileitemmodeltest.cpp
testdir.cpp
../kitemviews/kfileitemmodel.cpp
../kitemviews/kitemmodelbase.cpp
../kitemviews/kitemset.cpp
../dolphindebug.cpp
)
@ -117,8 +89,6 @@ target_link_libraries(kfileitemmodeltest dolphinprivate Qt5::Test)
set(kfileitemmodelbenchmark_SRCS
kfileitemmodelbenchmark.cpp
testdir.cpp
../kitemviews/kfileitemmodel.cpp
../kitemviews/kitemmodelbase.cpp
../dolphindebug.cpp
)
@ -133,7 +103,6 @@ target_link_libraries(kfileitemmodelbenchmark dolphinprivate Qt5::Test)
# KItemListKeyboardSearchManagerTest
set(kitemlistkeyboardsearchmanagertest_SRCS
kitemlistkeyboardsearchmanagertest.cpp
../kitemviews/private/kitemlistkeyboardsearchmanager.cpp
)
add_executable(kitemlistkeyboardsearchmanagertest ${kitemlistkeyboardsearchmanagertest_SRCS})
@ -161,9 +130,6 @@ endif()
# KStandardItemModelTest
set(kstandarditemmodeltest_SRCS
kstandarditemmodeltest.cpp
../kitemviews/kstandarditem.cpp
../kitemviews/kstandarditemmodel.cpp
../kitemviews/kitemmodelbase.cpp
../dolphindebug.cpp
)
@ -176,7 +142,6 @@ target_link_libraries(kstandarditemmodeltest dolphinprivate Qt5::Test)
set(viewpropertiestest_SRCS
viewpropertiestest.cpp
testdir.cpp
../views/viewproperties.cpp
../dolphindebug.cpp
)
kconfig_add_kcfg_files(viewpropertiestest_SRCS GENERATE_MOC

4
src/views/versioncontrol/kversioncontrolplugin.h
View file

@ -20,7 +20,7 @@
#ifndef KVERSIONCONTROLPLUGIN_H
#define KVERSIONCONTROLPLUGIN_H
#include <dolphin_export.h>
#include <dolphinvcs_export.h>
#include <QObject>
#include <QAction>
@ -81,7 +81,7 @@ class KFileItem;
*
* @since 4.8
*/
class DOLPHIN_EXPORT KVersionControlPlugin : public QObject
class DOLPHINVCS_EXPORT KVersionControlPlugin : public QObject
{
Q_OBJECT