From 138261fd3af339d5cb3273b76ac61dfaca70be1c Mon Sep 17 00:00:00 2001 From: John Till Date: Thu, 7 Nov 2024 23:28:42 +0000 Subject: [PATCH] Give up --- .github/workflows/source_instructions.sh | 5 ++--- app/CMakeLists.txt | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/source_instructions.sh b/.github/workflows/source_instructions.sh index 375821d..0514853 100644 --- a/.github/workflows/source_instructions.sh +++ b/.github/workflows/source_instructions.sh @@ -1,11 +1,10 @@ # Compile -apt-get install cmake python3 qtbase5-dev libqt5svg5-dev +apt-get install cmake python3 qtbase5-dev pip3 install -v "conan==1.65.0" -conan profile new default --detect && conan profile update settings.compiler.libcxx=libstdc++11 default git clone https://github.com/JohnDTill/Forscape cd ./Forscape conan install --generator cmake_find_package --install-folder ./build/conan-dependencies ./app -cmake -DCMAKE_BUILD_TYPE=Release -B build -S app +cmake -DCMAKE_BUILD_TYPE=Debug -B build -S app cd build make diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index bec109a..2e6de75 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -280,12 +280,12 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(Forscape PRIVATE $<$:-O1> #Need optimisation for MinGW to compile w/ Eigen unsupported -Wall -Wextra -pedantic #-Werror #EVENTUALLY: address warnings - #$<$: -Ofast -fmodulo-sched -fmodulo-sched-allow-regmoves -fgcse-sm -fgcse-las -fdelete-null-pointer-checks - #-fomit-frame-pointer -funroll-loops -fvisibility=hidden> #-fwhole-program -flto + $<$: -Ofast -fmodulo-sched -fmodulo-sched-allow-regmoves -fgcse-sm -fgcse-las -fdelete-null-pointer-checks + -fomit-frame-pointer -funroll-loops -fvisibility=hidden -fwhole-program -flto> + ) + target_link_options(Forscape PRIVATE + $<$:-Wa,-mbig-obj> ) - #target_link_options(Forscape PRIVATE - # -Wa,-mbig-obj - #) elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # using Clang elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")