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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move kdeui cmake macros to KDE4Support
From:       Kevin Ottens <ervin+bluesystems () kde ! org>
Date:       2013-08-20 9:18:37
Message-ID: E1VBi5F-0003iV-BG () scm ! kde ! org
[Download RAW message or body]

Git commit e67c25b9af31ae7bdeb8a9b2fd58cab4a31251a3 by Kevin Ottens.
Committed on 20/08/2013 at 07:27.
Pushed by ervin into branch 'frameworks'.

Move kdeui cmake macros to KDE4Support

M  +2    -2    cmake/modules/KDE4Macros.cmake
M  +0    -4    kdeui/CMakeLists.txt
M  +1    -1    staging/kde4attic/src/CMakeLists.txt
M  +5    -0    staging/kde4support/src/CMakeLists.txt
R  +0    -0    staging/kde4support/src/KDEUIMacros.cmake [from: kdeui/KDEUI=
Macros.cmake - 100% similarity]
R  +0    -0    staging/kde4support/src/kde4uic.cmake [from: kdeui/kde4uic.c=
make - 100% similarity]

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

diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
index f01bb05..67d6934 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -483,11 +483,11 @@ endmacro()
 if (_kdeBootStrapping)
   include("${CMAKE_SOURCE_DIR}/tier2/kauth/cmake/KAuthMacros.cmake")
   include("${CMAKE_SOURCE_DIR}/kdecore/KDECoreMacros.cmake")
-  include("${CMAKE_SOURCE_DIR}/kdeui/KDEUIMacros.cmake")
+  include("${CMAKE_SOURCE_DIR}/staging/kde4support/src/KDEUIMacros.cmake")
   include("${CMAKE_SOURCE_DIR}/staging/kdoctools/KDocToolsMacros.cmake")
 else()
   include("${KDE4_LIB_DIR}/cmake/KAuth/KAuthMacros.cmake")
   include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
-  include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
+  include("${KDE4_LIB_DIR}/cmake/KDE4Support/KDEUIMacros.cmake")
   include("${CMAKE_CURRENT_LIST_DIR}/KDocToolsMacros.cmake")
 endif()
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 3cd4211..192b645 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -113,7 +113,3 @@ install( FILES
  ${CMAKE_CURRENT_BINARY_DIR}/kdeui_export.h
  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
 =

-install( FILES
-    KDEUIMacros.cmake
-    kde4uic.cmake
-    DESTINATION ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel )
diff --git a/staging/kde4attic/src/CMakeLists.txt b/staging/kde4attic/src/C=
MakeLists.txt
index 928d201..4acf1b6 100644
--- a/staging/kde4attic/src/CMakeLists.txt
+++ b/staging/kde4attic/src/CMakeLists.txt
@@ -105,7 +105,7 @@ set(kde4attic_UI
 endif (X11_FOUND)
 =

 =

-kde4_add_ui_files(kde4attic_SRCS ${kde4attic_UI} )
+qt5_wrap_ui(kde4attic_SRCS ${kde4attic_UI} )
 =

 add_library(KDE4Attic ${kde4attic_SRCS})
 generate_export_header(KDE4Attic)
diff --git a/staging/kde4support/src/CMakeLists.txt b/staging/kde4support/s=
rc/CMakeLists.txt
index b395117..23e0875 100644
--- a/staging/kde4support/src/CMakeLists.txt
+++ b/staging/kde4support/src/CMakeLists.txt
@@ -354,3 +354,8 @@ install(FILES
     kio/kfilewrite.desktop
     DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
 )
+
+install( FILES
+    KDEUIMacros.cmake
+    kde4uic.cmake
+    DESTINATION ${CMAKECONFIG_INSTALL_DIR} COMPONENT Devel )
diff --git a/kdeui/KDEUIMacros.cmake b/staging/kde4support/src/KDEUIMacros.=
cmake
similarity index 100%
rename from kdeui/KDEUIMacros.cmake
rename to staging/kde4support/src/KDEUIMacros.cmake
diff --git a/kdeui/kde4uic.cmake b/staging/kde4support/src/kde4uic.cmake
similarity index 100%
rename from kdeui/kde4uic.cmake
rename to staging/kde4support/src/kde4uic.cmake

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