From 894df7fce318bfb3a88c7169ad4b95aee5f541d8 Mon Sep 17 00:00:00 2001 From: KAHR-Alpha <113597714+KAHR-Alpha@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:35:38 +0100 Subject: [PATCH 1/3] Update Ubuntu Dependencies.yml --- .github/workflows/Ubuntu Dependencies.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Ubuntu Dependencies.yml b/.github/workflows/Ubuntu Dependencies.yml index c4f2657..bbcf61c 100644 --- a/.github/workflows/Ubuntu Dependencies.yml +++ b/.github/workflows/Ubuntu Dependencies.yml @@ -70,7 +70,7 @@ jobs: - run: tar -xzf fftw-3.3.10.tar.gz - - run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/builds/fftw" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + - run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/builds/fftw" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS=0 working-directory: fftw-3.3.10 - run: cmake --build "${{github.workspace}}/cmake_build" --config ${{env.BUILD_TYPE}} @@ -139,4 +139,4 @@ jobs: - run: cmake --install "${{github.workspace}}/cmake_build" working-directory: wxWidgets-3.2.2.1 - - run: cp "${{github.workspace}}/builds/wxWidgets/lib/wx/include/gtk3-unicode-static-3.2/wx/setup.h" "${{github.workspace}}/builds/wxWidgets/include/wx-3.2/wx" \ No newline at end of file + - run: cp "${{github.workspace}}/builds/wxWidgets/lib/wx/include/gtk3-unicode-static-3.2/wx/setup.h" "${{github.workspace}}/builds/wxWidgets/include/wx-3.2/wx" From 724c62db88b5d2a18afe08bfb3dc3e5ced877f13 Mon Sep 17 00:00:00 2001 From: KAHR-Alpha <113597714+KAHR-Alpha@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:36:10 +0100 Subject: [PATCH 2/3] Update Ubuntu - Aether Build.yml --- .github/workflows/Ubuntu - Aether Build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Ubuntu - Aether Build.yml b/.github/workflows/Ubuntu - Aether Build.yml index b14805d..6228642 100644 --- a/.github/workflows/Ubuntu - Aether Build.yml +++ b/.github/workflows/Ubuntu - Aether Build.yml @@ -53,7 +53,7 @@ jobs: # retention-days: 1 - name: Configure CMake - run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DINSTALL_PATH="Aether_build" -DTASK="Build CLI+GUI" -DFFTW_INCLUDES="${{github.workspace}}/builds/fftw/include" -DFFTW_LIB="${{github.workspace}}/builds/fftw/lib/libfftw3.so" -DCPACK_BINARY_7Z=ON + run: cmake -B "${{github.workspace}}/cmake_build" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DINSTALL_PATH="Aether_build" -DTASK="Build CLI+GUI" -DFFTW_INCLUDES="${{github.workspace}}/builds/fftw/include" -DFFTW_LIB="${{github.workspace}}/builds/fftw/lib/libfftw3.a" -DCPACK_BINARY_7Z=ON - name: Build run: cmake --build "${{github.workspace}}/cmake_build" --config ${{env.BUILD_TYPE}} --parallel 8 From 9ff6089aa387e7ae3e0a0a42aeba1d03d2f46652 Mon Sep 17 00:00:00 2001 From: KAHR-Alpha <113597714+KAHR-Alpha@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:36:21 +0100 Subject: [PATCH 3/3] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8afd59..55c33eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ endfunction() set(CPACK_PACKAGE_VERSION_MAJOR 0) set(CPACK_PACKAGE_VERSION_MINOR 14) -set(CPACK_PACKAGE_VERSION_PATCH 0) +set(CPACK_PACKAGE_VERSION_PATCH 1) set(TASK "Build CLI" CACHE STRING "What to do") set_property(CACHE TASK PROPERTY STRINGS "Build CLI" "Build CLI+GUI")