Merge topic 'update-libarchive' ba5ced1be6 libarchive: Set build options the way we need for CMake 1e2bce305f Merge branch 'upstream-LibArchive' into update-libarchive e468170731 LibArchive 2022-12-09 (ba80276c) 744a42c0ee libarchive: Update script to get 3.6.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8431
diff --git a/Modules/Compiler/NVHPC-Fortran.cmake b/Modules/Compiler/NVHPC-Fortran.cmake index 5c06457..879c140 100644 --- a/Modules/Compiler/NVHPC-Fortran.cmake +++ b/Modules/Compiler/NVHPC-Fortran.cmake
@@ -1,4 +1,4 @@ include(Compiler/PGI-Fortran) include(Compiler/NVHPC) __compiler_nvhpc(Fortran) -set(CMAKE_Fortran_PREPROCESS_SOURCE_EXCLUDE_FLAGS_REGEX "(^| )-Werror +[a-z][a-z-]+( |$)") +set(CMAKE_Fortran_PREPROCESS_SOURCE_EXCLUDE_FLAGS_REGEX "(^| )-Werror([=,][a-z][a-z-]+)?( |$)")
diff --git a/Modules/Compiler/NVHPC.cmake b/Modules/Compiler/NVHPC.cmake index 474ac80..0593456 100644 --- a/Modules/Compiler/NVHPC.cmake +++ b/Modules/Compiler/NVHPC.cmake
@@ -13,5 +13,5 @@ macro(__compiler_nvhpc lang) # Logic specific to NVHPC. set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") - set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror" "all-warnings") + set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror") endmacro()
diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index 4423ebb..06457d9 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake
@@ -1042,7 +1042,11 @@ endif() _CUDAToolkit_find_and_add_import_lib(culibos) # it's a static library - foreach (cuda_lib cublasLt cufft curand nppc nvjpeg) + foreach (cuda_lib cublasLt cufft nvjpeg) + _CUDAToolkit_find_and_add_import_lib(${cuda_lib}) + _CUDAToolkit_find_and_add_import_lib(${cuda_lib}_static DEPS cudart_static_deps culibos) + endforeach() + foreach (cuda_lib curand nppc) _CUDAToolkit_find_and_add_import_lib(${cuda_lib}) _CUDAToolkit_find_and_add_import_lib(${cuda_lib}_static DEPS culibos) endforeach() @@ -1146,7 +1150,12 @@ _CUDAToolkit_find_and_add_import_lib(nvrtc DEPS nvrtc_builtins nvJitLink) if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 11.5.0) _CUDAToolkit_find_and_add_import_lib(nvrtc_builtins_static ALT nvrtc-builtins_static DEPS cuda_driver) - _CUDAToolkit_find_and_add_import_lib(nvrtc_static DEPS nvrtc_builtins_static nvptxcompiler_static nvJitLink_static) + if(NOT TARGET CUDA::nvrtc_static) + _CUDAToolkit_find_and_add_import_lib(nvrtc_static DEPS nvrtc_builtins_static nvptxcompiler_static nvJitLink_static) + if(TARGET CUDA::nvrtc_static AND WIN32 AND NOT (BORLAND OR MINGW OR CYGWIN)) + target_link_libraries(CUDA::nvrtc_static INTERFACE Ws2_32.lib) + endif() + endif() endif() _CUDAToolkit_find_and_add_import_lib(nvml ALT nvidia-ml nvml)
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b512f5d..75f8304 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 26) -set(CMake_VERSION_PATCH 20230425) +set(CMake_VERSION_PATCH 20230426) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0)
diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in index c47266a..3bb2fd6 100644 --- a/Templates/TestDriver.cxx.in +++ b/Templates/TestDriver.cxx.in
@@ -20,11 +20,19 @@ # else # define CM_NULL NULL # endif +# define CM_NAMESPACE_BEGIN namespace { +# define CM_NAMESPACE_END } +# define CM_LOCAL #else # define CM_CAST(TYPE, EXPR) (TYPE)(EXPR) # define CM_NULL NULL +# define CM_NAMESPACE_BEGIN +# define CM_NAMESPACE_END +# define CM_LOCAL static #endif +CM_NAMESPACE_BEGIN + /* Create map. */ typedef int (*MainFuncPointer)(int, char* []); /* NOLINT */ @@ -34,17 +42,17 @@ MainFuncPointer func; } functionMapEntry; -static functionMapEntry cmakeGeneratedFunctionMapEntries[] = { +CM_LOCAL const functionMapEntry cmakeGeneratedFunctionMapEntries[] = { @CMAKE_FUNCTION_TABLE_ENTRIES@ { CM_NULL, CM_NULL } /* NOLINT */ }; -static const int NumTests = CM_CAST(int, +CM_LOCAL const int NumTests = CM_CAST(int, sizeof(cmakeGeneratedFunctionMapEntries) / sizeof(functionMapEntry)) - 1; /* Allocate and create a lowercased copy of string (note that it has to be free'd manually) */ -static char* lowercase(const char* string) +CM_LOCAL char* lowercase(const char* string) { char *new_string; char *p; @@ -63,7 +71,7 @@ return new_string; } -static int isTestSkipped(const char *name, int n_skipped_tests, char *skipped_tests[]) { +CM_LOCAL int isTestSkipped(const char *name, int n_skipped_tests, char *skipped_tests[]) { int i; for (i = 0; i < n_skipped_tests; i++) { if (strcmp(name, skipped_tests[i]) == 0) { @@ -74,6 +82,8 @@ return 0; } +CM_NAMESPACE_END + int main(int ac, char* av[]) { int i;