[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: Re: [calligra] libs/pigment: Do not link to kdelibs4support
From: Adam Pigg <piggz1 () gmail ! com>
Date: 2015-09-14 8:20:45
Message-ID: 20150914082045.6324306.74931.39233 () gmail ! com
[Download RAW message or body]
Na, kreport and kproperty beat it :D
Sent from my BlackBerry 10 smartphone.
Original Message
From: Boudewijn Rempt
Sent: Monday, 14 September 2015 09:16
To: kde-commits@kde.org
Reply To: Calligra Suite developers and users mailing list
Cc: calligra-devel@kde.org; krita@kde.org
Subject: [calligra] libs/pigment: Do not link to kdelibs4support
Git commit 7f3d56081c492aaa28f160a84feb52e332c9cfc3 by Boudewijn Rempt.
Committed on 14/09/2015 at 08:15.
Pushed by rempt into branch 'master'.
Do not link to kdelibs4support
Pigment is the first Calligra library fully ported away
from kdelibs4support!
CCMAIL:calligra-devel@kde.org
CCMAIL:krita@kde.org
M +3 -3 libs/pigment/CMakeLists.txt
M +2 -2 libs/pigment/benchmarks/CMakeLists.txt
M +11 -11 libs/pigment/tests/CMakeLists.txt
http://commits.kde.org/calligra/7f3d56081c492aaa28f160a84feb52e332c9cfc3
diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
index 95ba25e..af9bb5c 100644
--- a/libs/pigment/CMakeLists.txt
+++ b/libs/pigment/CMakeLists.txt
@@ -133,15 +133,15 @@ generate_export_header(pigmentcms
)
if (HAVE_VC)
- target_link_libraries(pigmentcms KF5::I18n KF5::KDELibs4Support)
- target_link_libraries(pigmentcms LINK_INTERFACE_LIBRARIES KF5::I18n \
KF5::KDELibs4Support) + target_link_libraries(pigmentcms KF5::I18n )
+ target_link_libraries(pigmentcms LINK_INTERFACE_LIBRARIES KF5::I18n )
endif()
target_link_libraries(
pigmentcms
koplugin
${EXTRA_LIBRARIES}
- KF5::I18n KF5::KDELibs4Support
+ KF5::I18n
Qt5::Gui
Qt5::Xml
${WIN32_PLATFORM_NET_LIBS}
diff --git a/libs/pigment/benchmarks/CMakeLists.txt \
b/libs/pigment/benchmarks/CMakeLists.txt index 3f2c2ce..7837f39 100644
--- a/libs/pigment/benchmarks/CMakeLists.txt
+++ b/libs/pigment/benchmarks/CMakeLists.txt
@@ -5,9 +5,9 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
set(ko_colorspaces_benchmark_SRCS KoColorSpacesBenchmark.cpp)
calligra_add_benchmark(KoColorSpacesBenchmark TESTNAME \
pigment-benchmarks-KoColorSpacesBenchmark \
${ko_colorspaces_benchmark_SRCS})
-target_link_libraries(KoColorSpacesBenchmark pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(KoColorSpacesBenchmark \
pigmentcms KF5::I18n Qt5::Test)
set(ko_compositeops_benchmark_SRCS KoCompositeOpsBenchmark.cpp)
calligra_add_benchmark(KoCompositeOpsBenchmark TESTNAME \
pigment-benchmarks-KoCompositeOpsBenchmark \
${ko_compositeops_benchmark_SRCS})
-target_link_libraries(KoCompositeOpsBenchmark pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(KoCompositeOpsBenchmark \
pigmentcms KF5::I18n Qt5::Test)
diff --git a/libs/pigment/tests/CMakeLists.txt b/libs/pigment/tests/CMakeLists.txt
index 5fb86f9..c80aae2 100644
--- a/libs/pigment/tests/CMakeLists.txt
+++ b/libs/pigment/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ set(TestKoColorSpaceRegistry_test_SRCS TestKoColorSpaceRegistry.cpp \
)
kde4_add_unit_test(TestKoColorSpaceRegistry TESTNAME \
libs-pigment-TestKoColorSpaceRegistry ${TestKoColorSpaceRegistry_test_SRCS})
-target_link_libraries(TestKoColorSpaceRegistry pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(TestKoColorSpaceRegistry \
pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
@@ -31,7 +31,7 @@ set(TestKoColorSpaceAbstract_test_SRCS TestKoColorSpaceAbstract.cpp \
)
kde4_add_unit_test(TestKoColorSpaceAbstract TESTNAME \
libs-pigment-TestKoColorSpaceAbstract ${TestKoColorSpaceAbstract_test_SRCS})
-target_link_libraries(TestKoColorSpaceAbstract pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(TestKoColorSpaceAbstract \
pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
@@ -44,7 +44,7 @@ target_link_libraries(TestKoColorSpaceMaths pigmentcms Qt5::Test)
########### next target ###############
set(CCSGraph_GRAPH CCSGraph.cpp)
kde4_add_executable(CCSGraph ${CCSGraph_GRAPH})
-target_link_libraries(CCSGraph pigmentcms KF5::I18n KF5::KDELibs4Support)
+target_link_libraries(CCSGraph pigmentcms KF5::I18n )
########### next target ###############
@@ -52,7 +52,7 @@ set(TestColorConversionSystem_test_SRCS \
TestColorConversionSystem.cpp )
kde4_add_unit_test(TestColorConversionSystem TESTNAME \
libs-pigment-TestColorConversionSystem ${TestColorConversionSystem_test_SRCS})
-target_link_libraries(TestColorConversionSystem pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(TestColorConversionSystem \
pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
@@ -60,14 +60,14 @@ set(TestKoColor_test_SRCS TestKoColor.cpp )
kde4_add_unit_test(TestKoColor TESTNAME libs-pigment-TestKoColor \
${TestKoColor_test_SRCS})
-target_link_libraries(TestKoColor pigmentcms KF5::I18n KF5::KDELibs4Support \
Qt5::Test) +target_link_libraries(TestKoColor pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
set(TestKoIntegerMaths_test_SRCS TestKoIntegerMaths.cpp )
kde4_add_unit_test(TestKoIntegerMaths TESTNAME libs-pigment-TestKoIntegerMaths \
${TestKoIntegerMaths_test_SRCS})
-target_link_libraries(TestKoIntegerMaths pigmentcms KF5::I18n KF5::KDELibs4Support \
Qt5::Test) +target_link_libraries(TestKoIntegerMaths pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
@@ -75,7 +75,7 @@ set(TestConvolutionOpImpl_test_SRCS TestConvolutionOpImpl.cpp )
kde4_add_unit_test(TestConvolutionOpImpl TESTNAME libs-pigment-TestConvolutionOpImpl \
${TestConvolutionOpImpl_test_SRCS})
-target_link_libraries(TestConvolutionOpImpl pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(TestConvolutionOpImpl \
pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
@@ -84,7 +84,7 @@ set(TestKoRgbU8ColorSpaceTester_test_SRCS \
KoRgbU8ColorSpaceTester.cpp )
kde4_add_unit_test(TestKoRgbU8ColorSpaceTester TESTNAME \
libs-pigment-TestKoRgbU8ColorSpaceTester ${TestKoRgbU8ColorSpaceTester_test_SRCS})
-target_link_libraries(TestKoRgbU8ColorSpaceTester pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(TestKoRgbU8ColorSpaceTester \
pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
@@ -92,7 +92,7 @@ set(TestKoColorSpaceSanity_test_SRCS TestKoColorSpaceSanity.cpp )
kde4_add_unit_test(TestKoColorSpaceSanity TESTNAME \
libs-pigment-TestKoColorSpaceSanity ${TestKoColorSpaceSanity_test_SRCS})
-target_link_libraries(TestKoColorSpaceSanity pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) +target_link_libraries(TestKoColorSpaceSanity \
pigmentcms KF5::I18n Qt5::Test)
########### next target ###############
@@ -100,7 +100,7 @@ set(TestFallBackColorTransformation_test_SRCS \
TestFallBackColorTransformation.cp
kde4_add_unit_test(TestFallBackColorTransformation TESTNAME \
libs-pigment-TestFallBackColorTransformation \
${TestFallBackColorTransformation_test_SRCS})
-target_link_libraries(TestFallBackColorTransformation pigmentcms KF5::I18n \
KF5::KDELibs4Support Qt5::Test) \
+target_link_libraries(TestFallBackColorTransformation pigmentcms KF5::I18n \
Qt5::Test)
########### next target ###############
@@ -108,4 +108,4 @@ set(TestKoChannelInfo_test_SRCS TestKoChannelInfo.cpp )
kde4_add_unit_test(TestKoChannelInfo TESTNAME libs-pigment-TestKoChannelInfo \
${TestKoChannelInfo_test_SRCS})
-target_link_libraries(TestKoChannelInfo pigmentcms KF5::I18n KF5::KDELibs4Support \
Qt5::Test) +target_link_libraries(TestKoChannelInfo pigmentcms KF5::I18n Qt5::Test)
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic