|
|
92cace |
diff -up kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake
|
|
|
92cace |
--- kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2012-12-18 02:26:38.000000000 -0600
|
|
|
92cace |
+++ kdelibs-4.9.95/cmake/modules/FindKDE4Internal.cmake 2012-12-19 15:21:37.963466601 -0600
|
|
|
92cace |
@@ -38,10 +38,10 @@
|
|
|
92cace |
# The following variables are defined for the various tools required to
|
|
|
92cace |
# compile KDE software:
|
|
|
92cace |
#
|
|
|
92cace |
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
|
|
|
92cace |
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
|
|
|
92cace |
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
|
|
|
92cace |
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
|
|
|
92cace |
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
|
|
|
92cace |
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
|
|
|
92cace |
#
|
|
|
92cace |
# The following variables point to the location of the KDE libraries,
|
|
|
92cace |
# but shouldn't be used directly:
|
|
|
92cace |
@@ -191,7 +191,7 @@
|
|
|
92cace |
# relative path to the file.
|
|
|
92cace |
#
|
|
|
92cace |
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
|
|
92cace |
-# Use this to add widget description files for the makekdewidgets code generator
|
|
|
92cace |
+# Use this to add widget description files for the makekdewidgets4 code generator
|
|
|
92cace |
# for Qt Designer plugins.
|
|
|
92cace |
#
|
|
|
92cace |
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
|
|
|
92cace |
@@ -509,31 +509,31 @@ if (_kdeBootStrapping)
|
|
|
92cace |
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
|
|
|
92cace |
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
|
|
|
92cace |
if (NOT WINCE)
|
|
|
92cace |
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
|
|
|
92cace |
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
|
|
|
92cace |
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
|
|
|
92cace |
else (NOT WINCE)
|
|
|
92cace |
- set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
|
|
|
92cace |
+ set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
|
|
|
92cace |
set(KDE4_MEINPROC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 )
|
|
|
92cace |
endif(NOT WINCE)
|
|
|
92cace |
|
|
|
92cace |
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
|
|
|
92cace |
set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen )
|
|
|
92cace |
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
|
|
|
92cace |
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
|
|
|
92cace |
else (WIN32)
|
|
|
92cace |
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
|
|
|
92cace |
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
|
|
92cace |
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
|
|
92cace |
set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
|
|
92cace |
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
|
|
92cace |
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
|
|
92cace |
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4${CMAKE_EXECUTABLE_SUFFIX}.shell )
|
|
|
92cace |
endif (WIN32)
|
|
|
92cace |
|
|
|
92cace |
set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
|
|
|
92cace |
|
|
|
92cace |
|
|
|
92cace |
# when building kdelibs, make the kcfg rules depend on the binaries...
|
|
|
92cace |
- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
|
|
|
92cace |
+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
|
|
|
92cace |
set( _KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP kauth-policy-gen)
|
|
|
92cace |
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
|
|
|
92cace |
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
|
|
|
92cace |
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
|
|
92cace |
|
|
|
92cace |
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
|
|
92cace |
@@ -582,7 +582,8 @@ else (_kdeBootStrapping)
|
|
|
92cace |
|
|
|
92cace |
# KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
|
|
|
92cace |
# use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
|
|
|
92cace |
- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
|
|
|
92cace |
+ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
|
|
|
92cace |
+ link_directories("${KDE4_LIB_DIR}")
|
|
|
92cace |
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
|
|
|
92cace |
|
|
|
92cace |
|
|
|
92cace |
@@ -596,18 +597,18 @@ else (_kdeBootStrapping)
|
|
|
92cace |
|
|
|
92cace |
# get the build CONFIGURATIONS which were exported in this file, and use just the first
|
|
|
92cace |
# of them to get the location of the installed executables
|
|
|
92cace |
- get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
|
|
|
92cace |
+ get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
|
|
|
92cace |
list(GET _importedConfigurations 0 _firstConfig)
|
|
|
92cace |
|
|
|
92cace |
if(NOT WINCE)
|
|
|
92cace |
- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
|
|
|
92cace |
+ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
|
|
|
92cace |
get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig})
|
|
|
92cace |
else(NOT WINCE)
|
|
|
92cace |
- set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
|
|
|
92cace |
+ set(KDE4_KCFGC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
|
|
|
92cace |
set(KDE4_MEINPROC_EXECUTABLE ${HOST_BINDIR}/${CMAKE_CFG_INTDIR}/meinproc4 )
|
|
|
92cace |
endif(NOT WINCE)
|
|
|
92cace |
get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${KDE4_TARGET_PREFIX}kauth-policy-gen LOCATION_${_firstConfig})
|
|
|
92cace |
- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig})
|
|
|
92cace |
+ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${_firstConfig})
|
|
|
92cace |
|
|
|
92cace |
# allow searching cmake modules in all given kde install locations (KDEDIRS based)
|
|
|
92cace |
execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
92cace |
@@ -934,7 +935,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
|
|
|
92cace |
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
|
|
92cace |
"${KDE4_BIN_INSTALL_DIR}" )
|
|
|
92cace |
|
|
|
92cace |
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
|
|
|
92cace |
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
|
|
|
92cace |
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
|
|
|
92cace |
"${KDE4_LIB_INSTALL_DIR}" )
|
|
|
92cace |
|
|
|
92cace |
# under Windows dlls may be also installed in bin/
|
|
|
92cace |
@@ -1363,9 +1365,9 @@ macro (KDE4_PRINT_RESULTS)
|
|
|
92cace |
endif (NOT _kdeBootStrapping)
|
|
|
92cace |
|
|
|
92cace |
if(KDE4_KCFGC_EXECUTABLE)
|
|
|
92cace |
- message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
|
|
|
92cace |
+ message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
|
|
|
92cace |
else(KDE4_KCFGC_EXECUTABLE)
|
|
|
92cace |
- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
|
|
|
92cace |
+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
|
|
|
92cace |
endif(KDE4_KCFGC_EXECUTABLE)
|
|
|
92cace |
|
|
|
92cace |
if(AUTOMOC4_EXECUTABLE)
|
|
|
92cace |
@@ -1384,7 +1386,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
|
|
|
92cace |
endif (NOT KDE4_INSTALLED_VERSION_OK)
|
|
|
92cace |
|
|
|
92cace |
if (NOT KDE4_KCFGC_EXECUTABLE)
|
|
|
92cace |
- message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
|
|
|
92cace |
+ message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
|
|
|
92cace |
endif (NOT KDE4_KCFGC_EXECUTABLE)
|
|
|
92cace |
|
|
|
92cace |
message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
|
|
|
92cace |
diff -up kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh
|
|
|
92cace |
--- kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2012-12-17 08:14:16.000000000 -0600
|
|
|
92cace |
+++ kdelibs-4.9.95/doc/api/doxygen-preprocess-kcfg.sh 2012-12-19 15:21:37.963466601 -0600
|
|
|
92cace |
@@ -2,9 +2,9 @@
|
|
|
92cace |
# Generates and cleans KConfigXT source code during a API dox build
|
|
|
92cace |
#
|
|
|
92cace |
|
|
|
92cace |
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
|
|
|
92cace |
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
|
|
|
92cace |
if test -z "$kcfg_compiler"; then
|
|
|
92cace |
- echo "kconfig_compiler not found!"
|
|
|
92cace |
+ echo "kconfig_compiler4 not found!"
|
|
|
92cace |
exit 1;
|
|
|
92cace |
fi
|
|
|
92cace |
|
|
|
92cace |
diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl
|
|
|
92cace |
--- kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2012-12-17 08:14:16.000000000 -0600
|
|
|
92cace |
+++ kdelibs-4.9.95/kdecore/kconfig_compiler/checkkcfg.pl 2012-12-19 15:21:37.963466601 -0600
|
|
|
92cace |
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
|
|
92cace |
|
|
|
92cace |
$kcfgc = $file . "c";
|
|
|
92cace |
|
|
|
92cace |
-$cmd = "./kconfig_compiler $file $kcfgc";
|
|
|
92cace |
+$cmd = "./kconfig_compiler4 $file $kcfgc";
|
|
|
92cace |
|
|
|
92cace |
#print "CMD $cmd\n";
|
|
|
92cace |
|
|
|
92cace |
if ( system( $cmd ) != 0 ) {
|
|
|
92cace |
- print STDERR "Unable to run kconfig_compiler\n";
|
|
|
92cace |
+ print STDERR "Unable to run kconfig_compiler4\n";
|
|
|
92cace |
exit 1;
|
|
|
92cace |
}
|
|
|
92cace |
|
|
|
92cace |
diff -up kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt
|
|
|
92cace |
--- kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600
|
|
|
92cace |
+++ kdelibs-4.9.95/kdecore/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600
|
|
|
92cace |
@@ -11,13 +11,13 @@
|
|
|
92cace |
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
|
|
92cace |
|
|
|
92cace |
|
|
|
92cace |
- kde4_add_executable(kconfig_compiler NOGUI ${kconfig_compiler_SRCS})
|
|
|
92cace |
+ kde4_add_executable(kconfig_compiler4 NOGUI ${kconfig_compiler_SRCS})
|
|
|
92cace |
|
|
|
92cace |
- target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
|
|
92cace |
+ target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
|
|
92cace |
|
|
|
92cace |
# "export" this target too so we can use the LOCATION property of the imported target in
|
|
|
92cace |
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
|
|
|
92cace |
- install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
|
|
92cace |
+ install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
|
|
92cace |
|
|
|
92cace |
|
|
|
92cace |
# # export this binary for cross-compilation
|
|
|
92cace |
diff -up kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
|
|
92cace |
--- kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600
|
|
|
92cace |
+++ kdelibs-4.9.95/kdeui/tests/kconfig_compiler/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600
|
|
|
92cace |
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
|
|
|
92cace |
add_custom_command(
|
|
|
92cace |
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
|
|
92cace |
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
|
|
|
92cace |
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
|
|
|
92cace |
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
|
|
|
92cace |
|
|
|
92cace |
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
|
|
|
92cace |
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
|
|
|
92cace |
diff -up kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.9.95/kdewidgets/CMakeLists.txt
|
|
|
92cace |
--- kdelibs-4.9.95/kdewidgets/CMakeLists.txt.parallel_devel 2012-12-17 08:14:16.000000000 -0600
|
|
|
92cace |
+++ kdelibs-4.9.95/kdewidgets/CMakeLists.txt 2012-12-19 15:21:37.964466589 -0600
|
|
|
92cace |
@@ -14,24 +14,24 @@ include_directories(
|
|
|
92cace |
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
|
|
92cace |
|
|
|
92cace |
|
|
|
92cace |
-kde4_add_executable(makekdewidgets NOGUI ${makekdewidgets_SRCS})
|
|
|
92cace |
+kde4_add_executable(makekdewidgets4 NOGUI ${makekdewidgets_SRCS})
|
|
|
92cace |
|
|
|
92cace |
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
|
|
92cace |
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
|
|
92cace |
|
|
|
92cace |
# "export" this target too so we can use the LOCATION property of the imported target in
|
|
|
92cace |
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
|
|
|
92cace |
-install(TARGETS makekdewidgets EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
|
|
92cace |
+install(TARGETS makekdewidgets4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
|
|
92cace |
|
|
|
92cace |
|
|
|
92cace |
########### next target ###############
|
|
|
92cace |
|
|
|
92cace |
if(QT_QTDESIGNER_FOUND)
|
|
|
92cace |
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
|
|
|
92cace |
- get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
|
|
|
92cace |
+ get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
|
|
|
92cace |
|
|
|
92cace |
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
|
|
|
92cace |
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
|
|
|
92cace |
- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
|
|
|
92cace |
+ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
|
|
|
92cace |
|
|
|
92cace |
set(kdewidgets_PART_SRCS
|
|
|
92cace |
classpreviews.cpp
|
|
|
92cace |
@@ -61,7 +61,7 @@ if(QT_QTDESIGNER_FOUND)
|
|
|
92cace |
if(NOT KDE_NO_DEPRECATED)
|
|
|
92cace |
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp
|
|
|
92cace |
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdedeprecated.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdedeprecated.widgets
|
|
|
92cace |
- MAIN_DEPENDENCY kdedeprecated.widgets DEPENDS makekdewidgets)
|
|
|
92cace |
+ MAIN_DEPENDENCY kdedeprecated.widgets DEPENDS makekdewidgets4)
|
|
|
92cace |
|
|
|
92cace |
set(kdedeprecated_PART_SRCS
|
|
|
92cace |
classpreviews.cpp
|
|
|
92cace |
@@ -96,7 +96,7 @@ if(QT_QTDESIGNER_FOUND)
|
|
|
92cace |
|
|
|
92cace |
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
|
|
|
92cace |
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
|
|
|
92cace |
- MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets)
|
|
|
92cace |
+ MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets4)
|
|
|
92cace |
|
|
|
92cace |
set(kdewebkitwidgets_PART_SRCS
|
|
|
92cace |
classpreviews.cpp
|
|
|
92cace |
@@ -132,7 +132,7 @@ if(QT_QTDESIGNER_FOUND)
|
|
|
92cace |
|
|
|
92cace |
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
|
|
|
92cace |
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
|
|
|
92cace |
- MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
|
|
|
92cace |
+ MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
|
|
|
92cace |
|
|
|
92cace |
set(kde3supportwidgets_PART_SRCS
|
|
|
92cace |
classpreviews.cpp
|