15 files changed, 9 insertions(+), 7 deletions(-)

M CMakeLists.txt
R {config => cmake/modules}/CCacheConfig.cmake
R {config => cmake/modules}/Colours.cmake
R {config => cmake/modules}/CopyGdbInit.cmake
R {config => cmake/modules}/GenUpdateVersionJson.cmake
R {config => cmake/modules}/GenVersionHpp.cmake
R {config => cmake/modules}/ModuleConfig.cmake
R {config => cmake/modules}/ProjectConfig.cmake
R {config => cmake/modules}/SerialPort.cmake
R {config => cmake/modules}/TestTarget.cmake
R {config => cmake/modules}/Utils.cmake
R {config => cmake/modules}/Version.cmake
R {config => cmake/modules}/thirdparty.cmake
M configure.sh
M module-bluetooth/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"
     )

@@ 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(

@@ 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

@@ 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