Skip to content

Commit 0993737

Browse files
committed
Add microjson submodule to release build
- Disable tests by default
1 parent 316ee66 commit 0993737

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/tagadd.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v2
15+
- name: Init submodules
16+
run: git submodule update --init 3rdparty/microjson
1517
- name: Build release packages on ubuntu and opensuse latest
1618
id: build_release
1719
run: |

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
1414

1515
find_package(Qt5 COMPONENTS Core Network Qml REQUIRED)
1616

17+
set(MICROJSON_MAKE_TESTS OFF)
1718
if(NOT EXISTS "${QT_PROTOBUF_SOURCE_DIR}/3rdparty/microjson/CMakeLists.txt")
18-
message(FATAL_ERROR "microjson is not found. Please initialize microjson module: git submodule init 3rdparty/microjson")
19+
message(FATAL_ERROR "microjson is not found. Please initialize microjson module: git submodule update --init 3rdparty/microjson")
1920
else()
2021
add_subdirectory("${QT_PROTOBUF_SOURCE_DIR}/3rdparty/microjson" EXCLUDE_FROM_ALL)
2122
endif()

0 commit comments

Comments
 (0)