From a02c867020f0f7f4d399c1d2849ac990614036f8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 15 Jun 2015 13:15:26 +0900 Subject: Fix cmake template project files. This relates to bug 2308. Signed-off-by: Michele Calgaro (cherry picked from commit 065693194f81b16c3d6deb7fb70a07ae0e884eb6) --- languages/cpp/app_templates/CMakeLists.txt | 85 ++++++++++++---------- .../cpp/app_templates/cmakelibc/CMakeLists.txt | 7 +- .../app_templates/cmakelibc/cmakelibc.kdevtemplate | 2 +- .../cpp/app_templates/cmakelibcpp/CMakeLists.txt | 7 +- .../cmakelibcpp/cmakelibcpp.kdevtemplate | 2 +- .../cpp/app_templates/cmakeqt3app/CMakeLists.txt | 9 ++- .../cmakeqt3app/cmakeqt3app.kdevtemplate | 2 +- .../cpp/app_templates/cmakesimple/CMakeLists.txt | 5 +- .../cmakesimple/cmakesimple.kdevtemplate | 2 +- .../cpp/app_templates/cmakesimplec/CMakeLists.txt | 5 +- .../cmakesimplec/cmakesimplec.kdevtemplate | 2 +- 11 files changed, 69 insertions(+), 59 deletions(-) diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt index 52229fc6..14e63fa7 100644 --- a/languages/cpp/app_templates/CMakeLists.txt +++ b/languages/cpp/app_templates/CMakeLists.txt @@ -9,62 +9,67 @@ # ################################################# -add_subdirectory( kapp ) -add_subdirectory( kpartapp ) -add_subdirectory( kpartplugin ) -add_subdirectory( tdecmodule ) -add_subdirectory( kicker ) -add_subdirectory( tdeioslave ) -add_subdirectory( kdevpart ) -add_subdirectory( kdevpart2 ) +add_subdirectory( automakeempty ) add_subdirectory( chello ) -add_subdirectory( cpphello ) -add_subdirectory( tdescreensaver ) -add_subdirectory( kofficepart ) add_subdirectory( chello_gba ) +add_subdirectory( clanlib ) +add_subdirectory( cmakelibc ) +add_subdirectory( cmakelibcpp ) +add_subdirectory( cmakeqt3app ) +add_subdirectory( cmakesimple ) +add_subdirectory( cmakesimplec ) +add_subdirectory( cppcurseshello ) +add_subdirectory( cpphello ) +add_subdirectory( cppsdlhello ) add_subdirectory( dcopservice ) -add_subdirectory( konqnavpanel ) -add_subdirectory( qmakesimple ) -add_subdirectory( qmakeapp ) -add_subdirectory( qt4makeapp ) -add_subdirectory( khello ) -add_subdirectory( khello2 ) +# add_subdirectory( generichello ) +# add_subdirectory( gnome2mmapp ) +add_subdirectory( gtk2mmapp ) +add_subdirectory( kapp ) add_subdirectory( kateplugin ) add_subdirectory( kateplugin2 ) -add_subdirectory( qtopiaapp ) +add_subdirectory( kde4app ) add_subdirectory( kdedcop ) -add_subdirectory( wxhello ) -add_subdirectory( cppsdlhello ) -add_subdirectory( tdeconfig35 ) add_subdirectory( kdevlang ) -add_subdirectory( noatunvisual ) -add_subdirectory( noatunui ) +add_subdirectory( kdevpart ) +add_subdirectory( kdevpart2 ) +add_subdirectory( khello ) +add_subdirectory( khello2 ) +add_subdirectory( kicker ) +# add_subdirectory( kmake ) add_subdirectory( kmod ) -add_subdirectory( tdefileplugin ) -add_subdirectory( clanlib ) +add_subdirectory( kofficepart ) +add_subdirectory( konqnavpanel ) +add_subdirectory( kpartapp ) +add_subdirectory( kpartplugin ) +add_subdirectory( kscons_kxt ) +add_subdirectory( kscons_tdemdi ) +add_subdirectory( kxt ) +add_subdirectory( makefileempty ) +add_subdirectory( noatunui ) +add_subdirectory( noatunvisual ) add_subdirectory( opieapp ) add_subdirectory( opieapplet ) add_subdirectory( opieinput ) add_subdirectory( opiemenu ) add_subdirectory( opienet ) add_subdirectory( opietoday ) -add_subdirectory( kxt ) -add_subdirectory( gtk2mmapp ) -add_subdirectory( cppcurseshello ) -add_subdirectory( win32hello ) -add_subdirectory( win32gui ) -add_subdirectory( cmakesimple ) -add_subdirectory( cmakesimplec ) -add_subdirectory( cmakelibcpp ) -add_subdirectory( cmakelibc ) -add_subdirectory( kscons_kxt ) -add_subdirectory( kscons_tdemdi ) -add_subdirectory( qt4hello ) +# add_subdirectory( prc-tool ) +add_subdirectory( qmakeapp ) add_subdirectory( qmakeempty ) -add_subdirectory( automakeempty ) -add_subdirectory( makefileempty ) +add_subdirectory( qmakesimple ) +add_subdirectory( qt4hello ) +add_subdirectory( qt4makeapp ) add_subdirectory( qtopia4app ) -add_subdirectory( kde4app ) +add_subdirectory( qtopiaapp ) +add_subdirectory( tdecmodule ) +add_subdirectory( tdeconfig35 ) +add_subdirectory( tdefileplugin ) +add_subdirectory( tdeioslave ) +add_subdirectory( tdescreensaver ) +add_subdirectory( win32gui ) +add_subdirectory( win32hello ) +add_subdirectory( wxhello ) install( FILES c.appwizard diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt index 841853d8..9db2bf91 100644 --- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt @@ -10,9 +10,10 @@ ################################################# add_custom_target( cmakelibc.tar.gz ALL - COMMAND tar zcf cmakelibc.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - test.c lib.h lib.c cmakelibc.png cmakelibc-CMakeLists.txt - CMakeLists.txt.src + COMMAND tar --transform \"flags=r\;s/cmakelibc-CMakeLists.txt/CMakeLists.txt/\" + -zcf cmakelibc.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + test.c lib.h lib.c cmakelibc.png cmakelibc-CMakeLists.txt + CMakeLists.txt.src ) diff --git a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate index c05eaec4..cd5d052a 100644 --- a/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate +++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate @@ -102,7 +102,7 @@ Dest=%{dest}/src/%{APPNAMELC}.c [CMAKE] Type=finishcmd -Command=cmake ./ -GTDevelop3 +Command=cmake ./ -GKDevelop3 Directory=%{dest} [MSG] diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt index 26d7f3e2..3bf28dd3 100644 --- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt @@ -10,9 +10,10 @@ ################################################# add_custom_target( cmakelibcpp.tar.gz ALL - COMMAND tar zcf cmakelibcpp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - test.cpp lib.h lib.cpp cmakelibcpp.png - cmakelibcpp-CMakeLists.txt CMakeLists.txt.src + COMMAND tar --transform \"flags=r\;s/cmakelibcpp-CMakeLists.txt/CMakeLists.txt/\" + -zcf cmakelibcpp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + test.cpp lib.h lib.cpp cmakelibcpp.png + cmakelibcpp-CMakeLists.txt CMakeLists.txt.src ) diff --git a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate index 653a5ec0..e7046f67 100644 --- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate +++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate @@ -102,7 +102,7 @@ Dest=%{dest}/src/%{APPNAMELC}.cpp [CMAKE] Type=finishcmd -Command=cmake ./ -GTDevelop3 +Command=cmake ./ -GKDevelop3 Directory=%{dest} [MSG] diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt index b69d898f..96b10bd8 100644 --- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt @@ -10,10 +10,11 @@ ################################################# add_custom_target( cmakeqt3app.tar.gz ALL - COMMAND tar zcf cmakeqt3app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - main.cpp cmakeqt3app.cpp cmakeqt3app.h cmakeqt3app.png - filesave.xpm fileopen.xpm fileprint.xpm - cmakeqt3app-CMakeLists.txt CMakeLists.txt.src + COMMAND tar --transform \"flags=r\;s/cmakeqt3app-CMakeLists.txt/CMakeLists.txt/\" + -zcf cmakeqt3app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + main.cpp cmakeqt3app.cpp cmakeqt3app.h cmakeqt3app.png + filesave.xpm fileopen.xpm fileprint.xpm + cmakeqt3app-CMakeLists.txt CMakeLists.txt.src ) diff --git a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate index 50afb48a..adf1ddca 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate @@ -97,7 +97,7 @@ Dest=%{dest}/src/fileprint.xpm [CMAKE] Type=finishcmd -Command=cmake ./ -GTDevelop3 +Command=cmake ./ -GKDevelop3 Directory=%{dest} [MSG] diff --git a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt index 621dd48a..933deb27 100644 --- a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt @@ -10,8 +10,9 @@ ################################################# add_custom_target( cmakesimple.tar.gz ALL - COMMAND tar zcf cmakesimple.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - main.cpp cmakesimple.png cmakesimple-CMakeLists.txt README + COMMAND tar --transform \"flags=r\;s/cmakesimple-CMakeLists.txt/CMakeLists.txt/\" + -zcf cmakesimple.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + main.cpp cmakesimple.png cmakesimple-CMakeLists.txt README ) diff --git a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate index 14df4c4c..6c1df52b 100644 --- a/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate +++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate @@ -75,7 +75,7 @@ Dest=%{dest}/README [CMAKE] Type=finishcmd -Command=cmake ./ -GTDevelop3 +Command=cmake ./ -GKDevelop3 Directory=%{dest} [MSG] diff --git a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt index 4d07a4d6..72b9b610 100644 --- a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt @@ -10,8 +10,9 @@ ################################################# add_custom_target( cmakesimplec.tar.gz ALL - COMMAND tar zcf cmakesimplec.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - main.c cmakesimplec.png cmakesimplec-CMakeLists.txt + COMMAND tar --transform \"flags=r\;s/cmakesimplec-CMakeLists.txt/CMakeLists.txt/\" + -zcf cmakesimplec.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + main.c cmakesimplec.png cmakesimplec-CMakeLists.txt ) diff --git a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate index 25837634..8368256d 100644 --- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate +++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate @@ -78,7 +78,7 @@ Dest=%{dest}/main.c [CMAKE] Type=finishcmd -Command=cmake ./ -GTDevelop3 +Command=cmake ./ -GKDevelop3 Directory=%{dest} [MSG] -- cgit v1.2.3