diff options
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 697ffb0..c9f94f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,6 +209,9 @@ - export PATH=$PWD/.gitlab:$PWD/.gitlab/cmake/bin:$PATH - cmake --version - ninja --version + # Download Qt on macOS + - "[ \"$( uname -s )\" = \"Darwin\" ] && cmake -P .gitlab/ci/download_qt.cmake" + - "[ \"$( uname -s )\" = \"Darwin\" ] && export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt" .before_script_windows: &before_script_windows - Invoke-Expression -Command .gitlab/ci/cmake.ps1 diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake index 4b86d21..3589475 100644 --- a/.gitlab/ci/configure_macos_common.cmake +++ b/.gitlab/ci/configure_macos_common.cmake @@ -6,4 +6,6 @@ set(Java_JAVA_EXECUTABLE "" CACHE FILEPATH "") set(Java_JAVAC_EXECUTABLE "" CACHE FILEPATH "") set(Java_JAR_EXECUTABLE "" CACHE FILEPATH "") +set(BUILD_QtDialog ON CACHE BOOL "") + include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") |