Merge pull request #32 from KAHR-Alpha/ubuntu_fftw_fix

Ubuntu fftw fix
KAHR-Alpha · Feb 23, 2024 · db91bc7 · db91bc7
2 parents de99776 + 9ff6089
commit db91bc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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

diff --git 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"
+      - 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"
diff --git 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")