From 4910f91cc067b1022d773a40d5762b0ebd47d0f3 Mon Sep 17 00:00:00 2001 From: Tobias Predel Date: Thu, 14 Mar 2024 17:20:31 +0100 Subject: [PATCH] Do not install wxWidgets along with TreeSheets static build (#612) --- .github/workflows/build.yml | 2 -- CMakeLists.txt | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05652f5b..88cb6b83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,6 @@ jobs: run: cmake --build _build -j4 - name: install files run: cmake --install _build - - name: remove unnecessary files - run: rm -rf TreeSheets-relocatable/include TreeSheets-relocatable/lib TreeSheets-relocatable/bin/wx* - name: zip run: zip -r linux_treesheets_${{ matrix.cxx }}.zip TreeSheets-relocatable - name: upload build artifacts diff --git a/CMakeLists.txt b/CMakeLists.txt index 58293ed9..576cf3ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,7 @@ OPTION(TREESHEETS_WITH_STATIC_WXWIDGETS "Build wxWidgets along with TreeSheets a if (TREESHEETS_WITH_STATIC_WXWIDGETS) set(wxBUILD_SHARED OFF) + set(wxBUILD_INSTALL OFF CACHE BOOL "Avoid install/uninstall target for wxWidgets in static build" FORCE) add_subdirectory(lib/wxWidgets) else() find_package(wxWidgets REQUIRED aui adv core xml net)