wip

seqan · Oct 9, 2024 · 356bc00 · 356bc00
1 parent 11ca4c6
commit 356bc00
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/build_system/seqan3-install.cmake b/build_system/seqan3-install.cmake
@@ -24,7 +24,5 @@ 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 "${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")
+install (DIRECTORY "${SEQAN3_SDSL_INCLUDE_DIR}/sdsl" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor/sdsl")
+install (DIRECTORY "${SEQAN3_CEREAL_INCLUDE_DIR}/cereal" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/seqan3/vendor/cereal")
diff --git a/test/external_project/seqan3_fetch_content_zip/CMakeLists.txt b/test/external_project/seqan3_fetch_content_zip/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.14)
+cmake_minimum_required (VERSION 3.14...3.30)
 project (seqan3_app CXX)
 
 # --- helper scripts

diff --git a/test/external_project/seqan3_installed/CMakeLists.txt b/test/external_project/seqan3_installed/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.30)
 project (seqan3_app CXX)
 
 # --- helper scripts

diff --git a/test/external_project/seqan3_submodule_add_subdirectory/CMakeLists.txt b/test/external_project/seqan3_submodule_add_subdirectory/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.30)
 project (seqan3_app CXX)
 
 # --- helper scripts

diff --git a/test/external_project/seqan3_submodule_find_package/CMakeLists.txt b/test/external_project/seqan3_submodule_find_package/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2016-2024 Knut Reinert & MPI für molekulare Genetik
 # SPDX-License-Identifier: BSD-3-Clause
 
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.5...3.30)
 project (seqan3_app CXX)
 
 # --- helper scripts

diff --git a/test/seqan3-test.cmake b/test/seqan3-test.cmake
@@ -90,8 +90,8 @@ if (NOT TARGET seqan3::test)
         message (STATUS "Building tests with -Werror.")
     endif ()
 
-    # GCC12 and above: Disable warning about std::hardware_destructive_interference_size not being ABI-stable.
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        # GCC12 and above: Disable warning about std::hardware_destructive_interference_size not being ABI-stable.
         if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
             target_compile_options (seqan3_test INTERFACE "-Wno-interference-size")
         endif ()
@@ -100,13 +100,13 @@ if (NOT TARGET seqan3::test)
         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:
-    # `parameter passing for argument of type 'std::ranges::single_view<double>' when C++17 is enabled changed to match C++14 in GCC 10.1`
-    # https://github.com/gcc-mirror/gcc/commit/56fe3ca30e1343e4f232ca539726506440e23dd3
-    if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        target_compile_options (seqan3_test INTERFACE "-Wno-psabi")
+        # GCC on arm64 (M1): Disable notes about ABI changes. Example:
+        # `parameter passing for argument of type 'std::ranges::single_view<double>' when C++17 is enabled changed to match C++14 in GCC 10.1`
+        # https://github.com/gcc-mirror/gcc/commit/56fe3ca30e1343e4f232ca539726506440e23dd3
+        if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "arm64")
+            target_compile_options (seqan3_test INTERFACE "-Wno-psabi")
+        endif ()
     endif ()
 
     target_link_libraries (seqan3_test INTERFACE "seqan3::seqan3" "pthread")