test

goToMain · Mar 21, 2024 · 4628ebc · 4628ebc
1 parent d7cd1c7
commit 4628ebc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/cross-plaform-build.yml b/.github/workflows/cross-plaform-build.yml
@@ -24,12 +24,11 @@ jobs:
     - name: Configure
       run: |
         cmake -B build -DCMAKE_BUILD_TYPE=Debug -DCONFIG_OSDP_LIB_ONLY=on .
+        cat build/src/osdp_config.h
     - name: Build
       run: cmake --build build --parallel 8
     - name: Pack built binaries
-      run: |
-        cmake --build build -t package
-        cmake --build build -t package_source
+      run: cmake --build build --target package
     - name: Upload artifacts
       uses: actions/upload-artifact@v2
       with:

diff --git a/cmake/GitInfo.cmake b/cmake/GitInfo.cmake
@@ -18,10 +18,14 @@ if ("${GIT_REV}" STREQUAL "")
 	set(GIT_BRANCH "None")
 else()
 	execute_process(
-		COMMAND bash -c "git diff --quiet --exit-code || echo +"
-		OUTPUT_VARIABLE GIT_DIFF
+		COMMAND git diff --quiet --exit-code
+		RESULT_VARIABLE RETURN_CODE
 		OUTPUT_STRIP_TRAILING_WHITESPACE
+		ERROR_QUIET
 	)
+	if(RETURN_CODE AND NOT RETURN_CODE EQUAL 0)
+		set(GIT_DIFF "+")
+	endif()
 	execute_process(
 		COMMAND git describe --exact-match --tags
 		OUTPUT_VARIABLE GIT_TAG ERROR_QUIET

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -48,6 +48,7 @@ endif()
 
 # Generate osdp_config.h in build dir.
 set(REPO_ROOT ${CMAKE_SOURCE_DIR})
+message("REPO_ROOT ${REPO_ROOT}")
 configure_file(osdp_config.h.in osdp_config.h @ONLY)
 
 list(APPEND LIB_OSDP_SOURCES