From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 07 Jul 2022 11:12:33 +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 1o9NYj-0090hQ-Sr for lore@lore.pengutronix.de; Thu, 07 Jul 2022 11:12:33 +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 1o9NYm-0004v1-Fh; Thu, 07 Jul 2022 11:12:32 +0200 Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1o9NY9-0004uq-T2 for ptxdist@pengutronix.de; Thu, 07 Jul 2022 11:11:54 +0200 Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1o9NY8-00030Z-63 for ptxdist@pengutronix.de; Thu, 07 Jul 2022 11:11:52 +0200 From: Alexander Dahl To: ptxdist@pengutronix.de Date: Thu, 7 Jul 2022 11:11:52 +0200 Message-Id: <20220707091152.11519-1-ada@thorsis.com> Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.6 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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 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 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 --- .../src-cmake-prog/{@name@.cpp => @name@.c} | 0 rules/templates/src-cmake-prog/CMakeLists.txt | 32 ++----------------- rules/templates/src-cmake-prog/wizard.sh | 4 +-- 3 files changed, 5 insertions(+), 31 deletions(-) rename rules/templates/src-cmake-prog/{@name@.cpp => @name@.c} (100%) 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 bc81d861c..8baf3f64e 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 253eedca9..8f2903bf0 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 base-commit: 7384b37919cb66e12ff15b4264325cb5eba911c3 -- 2.30.2