diff options
| author | Vito Gamberini <vito@gamberini.email> | 2024-03-04 16:42:46 (GMT) |
|---|---|---|
| committer | Vito Gamberini <vito@gamberini.email> | 2024-03-04 18:09:58 (GMT) |
| commit | 7cf45c9e6a7633cb231dfa07d8e7346200242af0 (patch) | |
| tree | 013f5b71b9a2269461cb189d219a3da6d321d6ea /.gitlab | |
| parent | 47bc42b5ac66ed4a144ad7822c12cd9a3f34c333 (diff) | |
| download | CMake-7cf45c9e6a7633cb231dfa07d8e7346200242af0.zip CMake-7cf45c9e6a7633cb231dfa07d8e7346200242af0.tar.gz CMake-7cf45c9e6a7633cb231dfa07d8e7346200242af0.tar.bz2 | |
ASM_NASM: Improve support for standalone usage
* Add tests for standalone NASM usage
* Change generic ASM_NASM executable linker to <CMAKE_LINKER>
* Use CMAKE_SYSTEM_PROCESSOR to determine output format when used
without a C/CXX compiler
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/configure_debian12_ninja.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora39_makefiles.cmake | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_debian12_ninja.cmake b/.gitlab/ci/configure_debian12_ninja.cmake index 89c1108..efca7a1 100644 --- a/.gitlab/ci/configure_debian12_ninja.cmake +++ b/.gitlab/ci/configure_debian12_ninja.cmake @@ -1,2 +1,4 @@ +set(CMake_TEST_ASM_NASM "ON" CACHE BOOL "") + include("${CMAKE_CURRENT_LIST_DIR}/configure_debian12_ninja_common.cmake") set(CMake_TEST_UseSWIG "ON" CACHE BOOL "") diff --git a/.gitlab/ci/configure_fedora39_makefiles.cmake b/.gitlab/ci/configure_fedora39_makefiles.cmake index fe03851..6b33d24 100644 --- a/.gitlab/ci/configure_fedora39_makefiles.cmake +++ b/.gitlab/ci/configure_fedora39_makefiles.cmake @@ -6,6 +6,7 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_CTestUpdate_P4 "ON" CACHE BOOL "") endif() +set(CMake_TEST_ASM_NASM "ON" CACHE BOOL "") set(CMake_TEST_FindALSA "ON" CACHE BOOL "") set(CMake_TEST_FindBLAS "All;static=1;Generic" CACHE STRING "") set(CMake_TEST_FindBoost "ON" CACHE BOOL "") |