Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ubuntu fftw fix #32

Merged
merged 3 commits into from
Feb 23, 2024
Merged

Ubuntu fftw fix #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
894df7f
Update Ubuntu Dependencies.yml
KAHR-Alpha Feb 23, 2024
724c62d
Update Ubuntu - Aether Build.yml
KAHR-Alpha Feb 23, 2024
9ff6089
Update CMakeLists.txt
KAHR-Alpha Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Ubuntu - Aether Build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Ubuntu Dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading