wip

seqan · Oct 9, 2024 · 11ca4c6 · 11ca4c6
1 parent 6726bbe
commit 11ca4c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/build_system/seqan3-install.cmake b/build_system/seqan3-install.cmake
@@ -24,5 +24,7 @@ install (FILES "${SEQAN3_CLONE_DIR}/build_system/seqan3-config.cmake"
 # install seqan3 header files in /include/seqan3
 install (DIRECTORY "${SEQAN3_INCLUDE_DIR}/seqan3" TYPE INCLUDE)
 
-install (DIRECTORY "${sdsl-lite_SOURCE_DIR}/include/sdsl" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor/sdsl")
-install (DIRECTORY "${cereal_SOURCE_DIR}/include/cereal" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor/cereal")
+install (DIRECTORY "${SEQAN3_SDSL_INCLUDE_DIR}/include/sdsl"
+         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor/sdsl")
+install (DIRECTORY "${SEQAN3_CEREAL_INCLUDE_DIR}/include/cereal"
+         DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor/cereal")
diff --git a/test/seqan3-test.cmake b/test/seqan3-test.cmake
@@ -95,11 +95,11 @@ if (NOT TARGET seqan3::test)
         if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
             target_compile_options (seqan3_test INTERFACE "-Wno-interference-size")
         endif ()
-    endif ()
 
-    # Warn about failed return value optimization.
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14)
-        target_compile_options (seqan3_test INTERFACE "-Wnrvo")
+        # Warn about failed return value optimization.
+        if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14)
+            target_compile_options (seqan3_test INTERFACE "-Wnrvo")
+        endif ()
     endif ()
 
     # GCC on arm64 (M1): Disable notes about ABI changes. Example: