From b7622bf1497e09e62acf664d12bb711ec62a3f75 Mon Sep 17 00:00:00 2001 From: Radoslaw Wicik Date: Fri, 19 Feb 2021 14:30:08 +0100 Subject: [PATCH] [EGD-5812] Add cmake support for Products Move cmake scripts/modules to separate directory, adding Products will add new more scripts so first clean up, then changes. --- CMakeLists.txt | 4 ++-- {config => cmake/modules}/CCacheConfig.cmake | 0 {config => cmake/modules}/Colours.cmake | 0 {config => cmake/modules}/CopyGdbInit.cmake | 0 {config => cmake/modules}/GenUpdateVersionJson.cmake | 0 {config => cmake/modules}/GenVersionHpp.cmake | 2 +- {config => cmake/modules}/ModuleConfig.cmake | 0 {config => cmake/modules}/ProjectConfig.cmake | 0 {config => cmake/modules}/SerialPort.cmake | 0 {config => cmake/modules}/TestTarget.cmake | 0 {config => cmake/modules}/Utils.cmake | 0 {config => cmake/modules}/Version.cmake | 0 {config => cmake/modules}/thirdparty.cmake | 0 configure.sh | 8 ++++++-- module-bluetooth/CMakeLists.txt | 2 -- 15 files changed, 9 insertions(+), 7 deletions(-) rename {config => cmake/modules}/CCacheConfig.cmake (100%) rename {config => cmake/modules}/Colours.cmake (100%) rename {config => cmake/modules}/CopyGdbInit.cmake (100%) rename {config => cmake/modules}/GenUpdateVersionJson.cmake (100%) rename {config => cmake/modules}/GenVersionHpp.cmake (87%) rename {config => cmake/modules}/ModuleConfig.cmake (100%) rename {config => cmake/modules}/ProjectConfig.cmake (100%) rename {config => cmake/modules}/SerialPort.cmake (100%) rename {config => cmake/modules}/TestTarget.cmake (100%) rename {config => cmake/modules}/Utils.cmake (100%) rename {config => cmake/modules}/Version.cmake (100%) rename {config => cmake/modules}/thirdparty.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 771b902d65b12ff73e280be1abb656123669ffb8..c9b46b0fa701d6d7f6cecbe42915c11f58eedb3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") project(PurePhone) -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/config") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") include(Colours) include(CCacheConfig) @@ -396,7 +396,7 @@ add_custom_target( COMMAND ${CMAKE_COMMAND} -DSRC_DIR=${CMAKE_SOURCE_DIR} -B ${CMAKE_BINARY_DIR} - -P ${CMAKE_SOURCE_DIR}/config/GenVersionHpp.cmake + -P ${CMAKE_SOURCE_DIR}/cmake/modules/GenVersionHpp.cmake COMMENT "Generating version info" ) diff --git a/config/CCacheConfig.cmake b/cmake/modules/CCacheConfig.cmake similarity index 100% rename from config/CCacheConfig.cmake rename to cmake/modules/CCacheConfig.cmake diff --git a/config/Colours.cmake b/cmake/modules/Colours.cmake similarity index 100% rename from config/Colours.cmake rename to cmake/modules/Colours.cmake diff --git a/config/CopyGdbInit.cmake b/cmake/modules/CopyGdbInit.cmake similarity index 100% rename from config/CopyGdbInit.cmake rename to cmake/modules/CopyGdbInit.cmake diff --git a/config/GenUpdateVersionJson.cmake b/cmake/modules/GenUpdateVersionJson.cmake similarity index 100% rename from config/GenUpdateVersionJson.cmake rename to cmake/modules/GenUpdateVersionJson.cmake diff --git a/config/GenVersionHpp.cmake b/cmake/modules/GenVersionHpp.cmake similarity index 87% rename from config/GenVersionHpp.cmake rename to cmake/modules/GenVersionHpp.cmake index bbacbc5b087d10c3e02ace1c29b7bb584abbc327..6900abab06c968f6948dd429ac2f56a353b30f19 100644 --- a/config/GenVersionHpp.cmake +++ b/cmake/modules/GenVersionHpp.cmake @@ -1,7 +1,7 @@ # This script generates the source/version.hpp containing project version # information. It is meant to be run at build time by running CMake as a target. -list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/config") +list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/cmake/modules") include(Version) configure_file( diff --git a/config/ModuleConfig.cmake b/cmake/modules/ModuleConfig.cmake similarity index 100% rename from config/ModuleConfig.cmake rename to cmake/modules/ModuleConfig.cmake diff --git a/config/ProjectConfig.cmake b/cmake/modules/ProjectConfig.cmake similarity index 100% rename from config/ProjectConfig.cmake rename to cmake/modules/ProjectConfig.cmake diff --git a/config/SerialPort.cmake b/cmake/modules/SerialPort.cmake similarity index 100% rename from config/SerialPort.cmake rename to cmake/modules/SerialPort.cmake diff --git a/config/TestTarget.cmake b/cmake/modules/TestTarget.cmake similarity index 100% rename from config/TestTarget.cmake rename to cmake/modules/TestTarget.cmake diff --git a/config/Utils.cmake b/cmake/modules/Utils.cmake similarity index 100% rename from config/Utils.cmake rename to cmake/modules/Utils.cmake diff --git a/config/Version.cmake b/cmake/modules/Version.cmake similarity index 100% rename from config/Version.cmake rename to cmake/modules/Version.cmake diff --git a/config/thirdparty.cmake b/cmake/modules/thirdparty.cmake similarity index 100% rename from config/thirdparty.cmake rename to cmake/modules/thirdparty.cmake diff --git a/configure.sh b/configure.sh index 74c651d4b4be8250b8e3c77a5e008315ad64142e..0a03fddc47fededf67b8ff578b78510391b694c6 100755 --- a/configure.sh +++ b/configure.sh @@ -64,7 +64,6 @@ BUILD_TYPE=$2 if check_target && check_build_type ; then shift 2 - BUILD_DIR="build-${TARGET,,}-${CMAKE_BUILD_TYPE}" echo -e "build dir:\e[34m\n\t${BUILD_DIR}\e[0m" SRC_DIR=`pwd` @@ -86,7 +85,12 @@ if check_target && check_build_type ; then ${SRC_DIR} " echo -e "\e[32m${CMAKE_CMD}\e[0m" | tr -s " " if $CMAKE_CMD; then - echo -e "\e[32mcd ${BUILD_DIR} && make -j\e[0m" + Ninja=$(echo $@ | grep "Ninja") + if [[ -z ${Ninja} ]]; then + echo -e "\e[32mcd ${BUILD_DIR} && make -j $(nproc)\e[0m" + else + echo -e "\e[32mcd ${BUILD_DIR} && ninja\e[0m" + fi else echo -e "configuration error!" fi diff --git a/module-bluetooth/CMakeLists.txt b/module-bluetooth/CMakeLists.txt index 6e239cf15035a1224d299c45c715d60340b9034a..3ffc4467f30ebbae441bc5538c92abb6a6968c0a 100644 --- a/module-bluetooth/CMakeLists.txt +++ b/module-bluetooth/CMakeLists.txt @@ -1,7 +1,5 @@ project(module-bluetooth VERSION 1.0 DESCRIPTION "Bluetooth module library") -include(${CMAKE_SOURCE_DIR}/config/ModuleConfig.cmake) - set(CMAKE_CXX_STANDARD 17) set(SOURCES