From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 29 Jul 2022 08:28:34 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oHJUA-003GEf-Tg for lore@lore.pengutronix.de; Fri, 29 Jul 2022 08:28:34 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oHJU5-0003ul-Ak; Fri, 29 Jul 2022 08:28:29 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oHJPV-0006Ai-Mp; Fri, 29 Jul 2022 08:23:45 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oHJPU-000SOL-Vz; Fri, 29 Jul 2022 08:23:44 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oHJPU-00A2UI-0e; Fri, 29 Jul 2022 08:23:44 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 29 Jul 2022 08:23:44 +0200 Message-Id: <20220729062344.2392798-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707091152.11519-1-ada@thorsis.com> References: <20220707091152.11519-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] template: src-cmake-prog: Modernize CMake file X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 7b0eaf35f9a01a047a345c3b053f663a3b838cf5. Michael [sent from post-receive hook] On Fri, 29 Jul 2022 08:23:43 +0200, Alexander Dahl wrote: > Most things in that 'CMakeLists.txt' were out of date and/or > distracting. Rework towards a sane minimal modern version: > > - bump minimum required CMake version (3.1 has most things you need for > "Modern CMake", 3.0 lacks some useful things for that) > - add recommended 'project' command > - avoid source file globbing > - throw out all comments (especially those relating to Qt4) > > Additionally the source file which contained C code only, was renamed to > .c so CMake can call a C compiler for that (instead of the heavy C++ > stuff). > > Signed-off-by: Alexander Dahl > Message-Id: <20220707091152.11519-1-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/templates/src-cmake-prog/@name@.cpp b/rules/templates/src-cmake-prog/@name@.c > similarity index 100% > rename from rules/templates/src-cmake-prog/@name@.cpp > rename to rules/templates/src-cmake-prog/@name@.c > diff --git a/rules/templates/src-cmake-prog/CMakeLists.txt b/rules/templates/src-cmake-prog/CMakeLists.txt > index bc81d861c721..8baf3f64ec0f 100644 > --- a/rules/templates/src-cmake-prog/CMakeLists.txt > +++ b/rules/templates/src-cmake-prog/CMakeLists.txt > @@ -1,34 +1,8 @@ > - > -cmake_minimum_required(VERSION 2.6.0) > - > -#SET(QT_MIN_VERSION "4.5.0") > -#FIND_PACKAGE(Qt4 REQUIRED) > - > -file (GLOB SRC_FILES *.cpp) > - > -#set (FILES_TO_TRANSLATE ${SRC_FILES}) > -#file (GLOB TRANSLATIONS_FILES *.ts) > -# > -#option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts > -#files(WARNING: make clean will delete the source .ts files! Danger!)") > -# > -#if(UPDATE_TRANSLATIONS) > -# qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES}) > -#else(UPDATE_TRANSLATIONS) > -# qt4_add_translation(QM_FILES ${TRANSLATIONS_FILES}) > -#endif(UPDATE_TRANSLATIONS) > +cmake_minimum_required(VERSION 3.1) > +project(@name@) > > add_executable(@name@ > - ${SRC_FILES} > -# ${QM_FILES} > + @name@.c > ) > > -#target_link_libraries(@name@ > -# ${QT_QTCORE_LIBRARY} > -# ${QT_QTGUI_LIBRARY} > -#) > -# > -#include_directories(${QT_INCLUDE_DIR}) > - > install(TARGETS @name@ RUNTIME DESTINATION bin) > - > diff --git a/rules/templates/src-cmake-prog/wizard.sh b/rules/templates/src-cmake-prog/wizard.sh > index 253eedca9cce..8f2903bf0f24 100644 > --- a/rules/templates/src-cmake-prog/wizard.sh > +++ b/rules/templates/src-cmake-prog/wizard.sh > @@ -7,11 +7,11 @@ if [ -z "$NAME" ]; then > fi > NAME_UP="$(echo $NAME | tr '[a-z-]' '[A-Z_]')" > > -mv "@name@.cpp" "${NAME}.cpp" > +mv "@name@.c" "${NAME}.c" > > for i in \ > CMakeLists.txt \ > - "${NAME}.cpp" \ > + "${NAME}.c" \ > ; do > sed -i -e "s/\@name\@/${NAME}/g" \ > -e "s/\@NAME\@/${NAME_UP}/g" $i