From 81ca0dce1df4a15014b062bccd629a026d3487eb Mon Sep 17 00:00:00 2001 From: henrykorir Date: Thu, 23 May 2024 22:49:00 +0300 Subject: [PATCH] Added cmake script executer to install wxwidgets --- .github/workflows/cmake-multi-platform.yml | 8 ++++---- CMakeLists.txt | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 42439c4..da51688 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -54,10 +54,10 @@ jobs: run: | echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - name: Add wxWidgets 3.2 packages - # this is for build testing only, not shipping binaries, so don't bother verifying the key - run: | - sudo chmod +x script.sh && ./script.sh + # - name: Add wxWidgets 3.2 packages + # # this is for build testing only, not shipping binaries, so don't bother verifying the key + # run: | + # sudo chmod +x script.sh && ./script.sh - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. diff --git a/CMakeLists.txt b/CMakeLists.txt index a9b1580..96c7426 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,14 +2,15 @@ cmake_minimum_required(VERSION 3.5) project(wxMinesweeper LANGUAGES CXX) find_package(wxWidgets) if(NOT wxWidgets_FOUND) - include(ExternalProject) - ExternalProject_Add( - wxWidgets - GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets - GIT_TAG v3.2.4 - STEP_TARGETS build - ) - execute_process(COMMAND sudo ldconfig) + # include(ExternalProject) + # ExternalProject_Add( + # wxWidgets + # GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets + # GIT_TAG v3.2.4 + # STEP_TARGETS build + # ) + # execute_process(COMMAND sudo ldconfig) + execute_process(COMMAND sudo chmod +x ./script && ./script) endif() execute_process(COMMAND wx-config --version) include(${wxWidgets_USE_FILE})