[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks-kcolors] staging/kdeguiaddons: Move tests into staging/kdeguiaddons
From:       Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date:       2012-03-06 17:13:12
Message-ID: 20120306171312.62FE9A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit a2acbaccac373484838f229e85640027047bd954 by Giorgos Tsiapaliwkas.
Committed on 06/03/2012 at 18:06.
Pushed by tsiapaliwkas into branch 'frameworks-kcolors'.

Move tests into staging/kdeguiaddons

M  +44   -1    staging/kdeguiaddons/src/CMakeLists.txt
D  +0    -44   staging/kdeguiaddons/src/colors/CMakeLists.txt
R  +0    -0    staging/kdeguiaddons/tests/CMakeLists.txt [from: staging/kde=
guiaddons/src/colors/tests/CMakeLists.txt - 100% similarity]
R  +0    -0    staging/kdeguiaddons/tests/kcolorcollectiontest.cpp [from: s=
taging/kdeguiaddons/src/colors/tests/kcolorcollectiontest.cpp - 100% simila=
rity]
R  +0    -0    staging/kdeguiaddons/tests/kcolordlgtest.cpp [from: staging/=
kdeguiaddons/src/colors/tests/kcolordlgtest.cpp - 100% similarity]
R  +0    -0    staging/kdeguiaddons/tests/kcolorutilsdemo.cpp [from: stagin=
g/kdeguiaddons/src/colors/tests/kcolorutilsdemo.cpp - 100% similarity]
R  +0    -0    staging/kdeguiaddons/tests/kcolorutilsdemo.h [from: staging/=
kdeguiaddons/src/colors/tests/kcolorutilsdemo.h - 100% similarity]
R  +0    -0    staging/kdeguiaddons/tests/kcolorutilsdemo.ui [from: staging=
/kdeguiaddons/src/colors/tests/kcolorutilsdemo.ui - 100% similarity]
R  +0    -0    staging/kdeguiaddons/tests/kcolorutilstest.cpp [from: stagin=
g/kdeguiaddons/src/colors/tests/kcolorutilstest.cpp - 100% similarity]
R  +0    -0    staging/kdeguiaddons/tests/kcolorutilstest.h [from: staging/=
kdeguiaddons/src/colors/tests/kcolorutilstest.h - 100% similarity]

http://commits.kde.org/kdelibs/a2acbaccac373484838f229e85640027047bd954

diff --git a/staging/kdeguiaddons/src/CMakeLists.txt b/staging/kdeguiaddons=
/src/CMakeLists.txt
index e10e11f..f5776d8 100644
--- a/staging/kdeguiaddons/src/CMakeLists.txt
+++ b/staging/kdeguiaddons/src/CMakeLists.txt
@@ -1 +1,44 @@
-add_subdirectory(colors)
+cmake_minimum_required(VERSION 2.8.7)
+
+project(kdeguiaddons)
+
+find_package(extra-cmake-modules 0.0.2 REQUIRED)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${EXTRA_CMAKE_MODULES_MODULE_PA=
TH})
+
+include(ECMVersion)
+
+include_directories(
+ ${KDE4_KDECORE_INCLUDES}
+ ${CMAKE_CURRENT_SOURCE_DIR}/colors
+ ${DBUSMENUQT_INCLUDE_DIR}
+)
+
+set(kdeguiaddons_LIB_SRCS
+ kcolorspaces.cpp
+ kcolorutils.cpp
+ kcolorscheme.cpp
+ kcolorcollection.cpp
+ kcolorhelpers.cpp
+ kcolormimedata.cpp
+)
+
+add_library(kdeguiaddons ${LIBRARY_TYPE} ${kdeguiaddons_LIB_SRCS})
+
+generate_export_header(kdeguiaddons)
+
+target_link_libraries(kdeguiaddons ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY=
} ${KDEUI_EXTRA_LIBS})
+
+install(TARGETS kdeguiaddons EXPORT kdelibsLibraryTargets ${INSTALL_TARGET=
S_DEFAULT_ARGS})
+
+install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/kdeguiaddons_export.h
+ kcolorutils.h
+ kcolorscheme.h
+ kcolorcollection.h
+ kcolormimedata.h
+
+ DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+)
+
+add_subdirectory(tests)
diff --git a/staging/kdeguiaddons/src/colors/CMakeLists.txt b/staging/kdegu=
iaddons/src/colors/CMakeLists.txt
deleted file mode 100644
index f5776d8..0000000
--- a/staging/kdeguiaddons/src/colors/CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-cmake_minimum_required(VERSION 2.8.7)
-
-project(kdeguiaddons)
-
-find_package(extra-cmake-modules 0.0.2 REQUIRED)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${EXTRA_CMAKE_MODULES_MODULE_PA=
TH})
-
-include(ECMVersion)
-
-include_directories(
- ${KDE4_KDECORE_INCLUDES}
- ${CMAKE_CURRENT_SOURCE_DIR}/colors
- ${DBUSMENUQT_INCLUDE_DIR}
-)
-
-set(kdeguiaddons_LIB_SRCS
- kcolorspaces.cpp
- kcolorutils.cpp
- kcolorscheme.cpp
- kcolorcollection.cpp
- kcolorhelpers.cpp
- kcolormimedata.cpp
-)
-
-add_library(kdeguiaddons ${LIBRARY_TYPE} ${kdeguiaddons_LIB_SRCS})
-
-generate_export_header(kdeguiaddons)
-
-target_link_libraries(kdeguiaddons ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY=
} ${KDEUI_EXTRA_LIBS})
-
-install(TARGETS kdeguiaddons EXPORT kdelibsLibraryTargets ${INSTALL_TARGET=
S_DEFAULT_ARGS})
-
-install( FILES
- ${CMAKE_CURRENT_BINARY_DIR}/kdeguiaddons_export.h
- kcolorutils.h
- kcolorscheme.h
- kcolorcollection.h
- kcolormimedata.h
-
- DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
-)
-
-add_subdirectory(tests)
diff --git a/staging/kdeguiaddons/src/colors/tests/CMakeLists.txt b/staging=
/kdeguiaddons/tests/CMakeLists.txt
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/CMakeLists.txt
rename to staging/kdeguiaddons/tests/CMakeLists.txt
diff --git a/staging/kdeguiaddons/src/colors/tests/kcolorcollectiontest.cpp=
 b/staging/kdeguiaddons/tests/kcolorcollectiontest.cpp
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/kcolorcollectiontest.cpp
rename to staging/kdeguiaddons/tests/kcolorcollectiontest.cpp
diff --git a/staging/kdeguiaddons/src/colors/tests/kcolordlgtest.cpp b/stag=
ing/kdeguiaddons/tests/kcolordlgtest.cpp
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/kcolordlgtest.cpp
rename to staging/kdeguiaddons/tests/kcolordlgtest.cpp
diff --git a/staging/kdeguiaddons/src/colors/tests/kcolorutilsdemo.cpp b/st=
aging/kdeguiaddons/tests/kcolorutilsdemo.cpp
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/kcolorutilsdemo.cpp
rename to staging/kdeguiaddons/tests/kcolorutilsdemo.cpp
diff --git a/staging/kdeguiaddons/src/colors/tests/kcolorutilsdemo.h b/stag=
ing/kdeguiaddons/tests/kcolorutilsdemo.h
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/kcolorutilsdemo.h
rename to staging/kdeguiaddons/tests/kcolorutilsdemo.h
diff --git a/staging/kdeguiaddons/src/colors/tests/kcolorutilsdemo.ui b/sta=
ging/kdeguiaddons/tests/kcolorutilsdemo.ui
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/kcolorutilsdemo.ui
rename to staging/kdeguiaddons/tests/kcolorutilsdemo.ui
diff --git a/staging/kdeguiaddons/src/colors/tests/kcolorutilstest.cpp b/st=
aging/kdeguiaddons/tests/kcolorutilstest.cpp
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/kcolorutilstest.cpp
rename to staging/kdeguiaddons/tests/kcolorutilstest.cpp
diff --git a/staging/kdeguiaddons/src/colors/tests/kcolorutilstest.h b/stag=
ing/kdeguiaddons/tests/kcolorutilstest.h
similarity index 100%
rename from staging/kdeguiaddons/src/colors/tests/kcolorutilstest.h
rename to staging/kdeguiaddons/tests/kcolorutilstest.h

[prev in list] [next in list] [prev in thread] [next in thread]