diff options
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_makefiles.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_xcode.cmake | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake index 3589475..bd5902b 100644 --- a/.gitlab/ci/configure_macos_common.cmake +++ b/.gitlab/ci/configure_macos_common.cmake @@ -7,5 +7,3 @@ 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") diff --git a/.gitlab/ci/configure_macos_makefiles.cmake b/.gitlab/ci/configure_macos_makefiles.cmake index 0f4f194..85f67b5 100644 --- a/.gitlab/ci/configure_macos_makefiles.cmake +++ b/.gitlab/ci/configure_macos_makefiles.cmake @@ -1 +1,2 @@ include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_ninja.cmake b/.gitlab/ci/configure_macos_ninja.cmake index 0f4f194..85f67b5 100644 --- a/.gitlab/ci/configure_macos_ninja.cmake +++ b/.gitlab/ci/configure_macos_ninja.cmake @@ -1 +1,2 @@ include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") diff --git a/.gitlab/ci/configure_macos_xcode.cmake b/.gitlab/ci/configure_macos_xcode.cmake new file mode 100644 index 0000000..1b976d2 --- /dev/null +++ b/.gitlab/ci/configure_macos_xcode.cmake @@ -0,0 +1,2 @@ +include("${CMAKE_CURRENT_LIST_DIR}/configure_macos_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") |