CMake scripts - handle errors

Also run cmake in proper directory - no need to change directory.
RoEdAl · Jul 21, 2023 · a3fad9d · a3fad9d
1 parent 9412fc9
commit a3fad9d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -124,12 +124,10 @@ jobs:
         path: asterisk-modules/asterisk-chan-quectel
 
     - name: Configure project
-      working-directory: asterisk-modules/asterisk-chan-quectel
-      run: cmake -P make-build-dir.cmake
+      run: cmake -P asterisk-modules/asterisk-chan-quectel/make-build-dir.cmake
 
     - name: Generate OpenWRT Makefile
-      working-directory: asterisk-modules/asterisk-chan-quectel
-      run: cmake -P install-openwrt-makefile.cmake
+      run: cmake -P asterisk-modules/asterisk-chan-quectel/install-openwrt-makefile.cmake
 
     - name: Check OpenWRT SDK config file
       id: check-owrt-cfg

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # asterisk-chan-quectel
 #
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.14)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.19)
 
 FUNCTION(SetProjectVersion cmajor cminor cpatch ctweak cstatus)
     MATH(EXPR MMAJOR "${cmajor}")

diff --git a/install-chan-quectel.cmake b/install-chan-quectel.cmake
@@ -1,7 +1,10 @@
 #!/usr/bin/cmake -P
 
-SET(ENV{DESTDIR} ${CMAKE_SOURCE_DIR}/install/chan-quectel)
+CMAKE_PATH(GET CMAKE_SCRIPT_MODE_FILE PARENT_PATH SCRIPT_DIR)
+
+SET(ENV{DESTDIR} ${SCRIPT_DIR}/install/chan-quectel)
 EXECUTE_PROCESS(
     COMMAND ${CMAKE_COMMAND} --install build --component chan-quectel --prefix=/usr
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${SCRIPT_DIR}
+    COMMAND_ERROR_IS_FATAL ANY
 )
diff --git a/install-openwrt-makefile.cmake b/install-openwrt-makefile.cmake
@@ -1,7 +1,10 @@
 #!/usr/bin/cmake -P
 
-SET(ENV{DESTDIR} ${CMAKE_SOURCE_DIR}/install)
+CMAKE_PATH(GET CMAKE_SCRIPT_MODE_FILE PARENT_PATH SCRIPT_DIR)
+
+SET(ENV{DESTDIR} ${SCRIPT_DIR}/install)
 EXECUTE_PROCESS(
     COMMAND ${CMAKE_COMMAND} --install build --component openwrt --prefix=/
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${SCRIPT_DIR}
+    COMMAND_ERROR_IS_FATAL ANY
 )
diff --git a/make-build-dir.cmake b/make-build-dir.cmake
@@ -1,6 +1,9 @@
 #!/usr/bin/cmake -P
 
+CMAKE_PATH(GET CMAKE_SCRIPT_MODE_FILE PARENT_PATH SCRIPT_DIR)
+
 EXECUTE_PROCESS(
     COMMAND ${CMAKE_COMMAND} --preset default
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${SCRIPT_DIR}
+    COMMAND_ERROR_IS_FATAL ANY
 )
diff --git a/make-package.cmake b/make-package.cmake
@@ -1,6 +1,9 @@
 #!/usr/bin/cmake -P
 
+CMAKE_PATH(GET CMAKE_SCRIPT_MODE_FILE PARENT_PATH SCRIPT_DIR)
+
 EXECUTE_PROCESS(
     COMMAND ${CMAKE_COMMAND} --build --preset package
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${SCRIPT_DIR}
+    COMMAND_ERROR_IS_FATAL ANY
 )