Sfoglia il codice sorgente

Add microjson submodule to release build

- Disable tests by default
Alexey Edelev 4 anni fa
parent
commit
09937376ea
2 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 2 0
      .github/workflows/tagadd.yml
  2. 2 1
      CMakeLists.txt

+ 2 - 0
.github/workflows/tagadd.yml

@@ -12,6 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Init submodules
+      run: git submodule update --init 3rdparty/microjson
     - name: Build release packages on ubuntu and opensuse latest
       id: build_release
       run: |

+ 2 - 1
CMakeLists.txt

@@ -14,8 +14,9 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
 
 find_package(Qt5 COMPONENTS Core Network Qml REQUIRED)
 
+set(MICROJSON_MAKE_TESTS OFF)
 if(NOT EXISTS "${QT_PROTOBUF_SOURCE_DIR}/3rdparty/microjson/CMakeLists.txt")
-    message(FATAL_ERROR "microjson is not found. Please initialize microjson module: git submodule init 3rdparty/microjson")
+    message(FATAL_ERROR "microjson is not found. Please initialize microjson module: git submodule update --init 3rdparty/microjson")
 else()
     add_subdirectory("${QT_PROTOBUF_SOURCE_DIR}/3rdparty/microjson" EXCLUDE_FROM_ALL)
 endif()