fixes

steineggerlab · Dec 5, 2023 · d1742d1 · d1742d1
1 parent e1925ed
commit d1742d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -90,15 +90,19 @@ jobs:
           cd build
           export CC=gcc-12
           export CXX=g++-12
+          WERROR=1
+          if [ "${{ matrix.BUILD_TYPE }}" = "ASanOpt" ]; then
+              WERROR=0
+          fi
           if [ "${{ matrix.STATIC }}" -eq "1" ]; then
               cmake -DHAVE_SANITIZER=1 -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DHAVE_TESTS=1 \
                 -DBUILD_SHARED_LIBS=OFF \
                 -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc \
                 -static-libstdc++" -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
-                -DENABLE_WERROR=1 -DHAVE_${{ matrix.SIMD }}=1 -DHAVE_MPI=${{ matrix.MPI }} ..
+                -DENABLE_WERROR=$WERROR -DHAVE_${{ matrix.SIMD }}=1 -DHAVE_MPI=${{ matrix.MPI }} ..
           else
               cmake -DHAVE_SANITIZER=1 -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -DHAVE_TESTS=1 \
-                -DENABLE_WERROR=1 -DHAVE_${{ matrix.SIMD }}=1 -DHAVE_MPI=${{ matrix.MPI }} ..
+                -DENABLE_WERROR=$WERROR -DHAVE_${{ matrix.SIMD }}=1 -DHAVE_MPI=${{ matrix.MPI }} ..
           fi
           make -j $(nproc --all)
 
@@ -153,8 +157,8 @@ jobs:
           CC=${{ matrix.CPREF }}-linux-gnu-gcc CXX=${{ matrix.CPREF }}-linux-gnu-g++ \
           cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHAVE_TESTS=1 \
             -DBUILD_SHARED_LIBS=OFF \
-            -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc \
-            -static-libstdc++" -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
+            -DCMAKE_EXE_LINKER_FLAGS="-static -static-libgcc -static-libstdc++" \
+            -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
             -DENABLE_WERROR=1 -DHAVE_${{ matrix.SIMD }}=1 ..
           make -j $(nproc --all)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -16,5 +16,7 @@ add_dependencies(foldmason foldmason-generated local-generated)
 target_include_directories(foldmason PUBLIC ${PROJECT_BINARY_DIR}/generated)
 target_include_directories(foldseek-framework PUBLIC ${PROJECT_BINARY_DIR}/lib/foldseek/generated)
 target_link_libraries(foldmason version)
+target_link_libraries(foldseek-framework version)
+target_link_libraries(mmseqs-framework version)
 
 install(TARGETS foldmason DESTINATION bin)