diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-06-22 16:40:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-07-17 06:28:58 +0000 |
| commit | 422fa4746c60a70f7ddebf98856a4652271e4c52 (patch) | |
| tree | e741042337a41bcace0aaec236faf6132d82454d | |
| parent | c45487b07f0a86258106112ab4c2c712a76e109e (diff) | |
GitHub: Avoid failure prone symlink for macOS
Change-Id: I4042ba21d48792b7e963032d21bfcc4e34e9e423
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | .github/workflows/build_qmake.yml | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/.github/workflows/build_qmake.yml b/.github/workflows/build_qmake.yml index fcd9e48..980341f 100644 --- a/.github/workflows/build_qmake.yml +++ b/.github/workflows/build_qmake.yml @@ -129,7 +129,7 @@ jobs: endif() if ("${{ runner.os }}" STREQUAL "Windows") - set(qtc_output_directory "qtcreator/lib/qtcreator/plugins") + set(qtc_output_directory "target/lib/qtcreator/plugins") set(qtc_binary_name "$ENV{PLUGIN_NAME}4.dll") if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat") set(qtc_platform "windows_x64") @@ -137,11 +137,11 @@ jobs: set(qtc_platform "windows_x86") endif() elseif ("${{ runner.os }}" STREQUAL "Linux") - set(qtc_output_directory "qtcreator/lib/qtcreator/plugins") + set(qtc_output_directory "target/lib/qtcreator/plugins") set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.so") set(qtc_platform "linux_x64") elseif ("${{ runner.os }}" STREQUAL "macOS") - set(qtc_output_directory "qtcreator/bin/Qt Creator.app/Contents/PlugIns") + set(qtc_output_directory "target/PlugIns") set(qtc_binary_name "lib$ENV{PLUGIN_NAME}.dylib") set(qtc_platform "mac_x64") endif() @@ -159,15 +159,6 @@ jobs: ${CMAKE_COMMAND} -E tar xvf ../${package}.7z WORKING_DIRECTORY qtcreator) endforeach() - if ("${{ runner.os }}" STREQUAL "macOS") - execute_process( - COMMAND ${CMAKE_COMMAND} -E make_directory qtcreator/bin - COMMAND ${CMAKE_COMMAND} -E create_symlink - "$ENV{GITHUB_WORKSPACE}/qtcreator/Qt Creator.app" - "$ENV{GITHUB_WORKSPACE}/qtcreator/bin/Qt Creator.app" - ) - endif() - - name: Configure shell: cmake -P {0} run: | @@ -187,14 +178,21 @@ jobs: endforeach() endif() - file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtcreator_dir) + if ("${{ runner.os }}" STREQUAL "macOS") + file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator/Qt Creator.app" qtcreator_build) + else() + file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtcreator_build) + endif() + file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qtcreator" qtcreator_source) + file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/target" target_path) execute_process( COMMAND ${{ steps.qt.outputs.qt_dir }}/bin/qmake $ENV{PLUGIN_PRO} CONFIG+=release - IDE_SOURCE_TREE="${qtcreator_dir}" - IDE_BUILD_TREE="${qtcreator_dir}" + IDE_SOURCE_TREE="${qtcreator_source}" + IDE_BUILD_TREE="${qtcreator_build}" + IDE_OUTPUT_PATH="${target_path}" RESULT_VARIABLE result ) if (NOT result EQUAL 0) |