diff --git a/Tests/PerConfig/CMakeLists.txt b/Tests/PerConfig/CMakeLists.txt index 7f461b0ecb..d6d63d1799 100644 --- a/Tests/PerConfig/CMakeLists.txt +++ b/Tests/PerConfig/CMakeLists.txt @@ -1,5 +1,7 @@ project(PerConfig C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + # Targets with per-configuration names. add_library(pcStatic STATIC pcStatic.c) set_property(TARGET pcStatic PROPERTY RELEASE_POSTFIX -opt) diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json index b57ab45cf9..27a1c45904 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/directories/top.json @@ -51,7 +51,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 43, + "line": 45, "command": "install", "hasParent": true }, @@ -96,7 +96,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -144,7 +144,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -189,7 +189,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -233,7 +233,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -277,7 +277,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 51, + "line": 53, "command": "install", "hasParent": true }, @@ -324,7 +324,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 53, + "line": 55, "command": "install", "hasParent": true }, @@ -369,7 +369,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 54, + "line": 56, "command": "install", "hasParent": true }, @@ -418,7 +418,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 55, + "line": 57, "command": "install", "hasParent": true }, @@ -470,7 +470,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 56, + "line": 58, "command": "install", "hasParent": true }, @@ -519,7 +519,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 57, + "line": 59, "command": "install", "hasParent": true }, @@ -561,7 +561,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 58, + "line": 60, "command": "install", "hasParent": true }, @@ -603,7 +603,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 59, + "line": 61, "command": "install", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json index c6ff37a2ef..a9c313b75b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_exe.json @@ -16,7 +16,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 6, + "line": 8, "command": "add_executable", "hasParent": true }, @@ -64,7 +64,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 6, + "line": 8, "command": "add_executable", "hasParent": true }, @@ -114,7 +114,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 7, + "line": 9, "command": "target_link_libraries", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json index 5b58dd1b36..4a0a43d289 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_lib.json @@ -16,7 +16,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 5, + "line": 7, "command": "add_library", "hasParent": true }, @@ -64,7 +64,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 5, + "line": 7, "command": "add_library", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json index 5e92840a74..09cbf2d1be 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_exe.json @@ -16,7 +16,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 10, + "line": 12, "command": "add_executable", "hasParent": true }, @@ -64,7 +64,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 10, + "line": 12, "command": "add_executable", "hasParent": true }, @@ -114,7 +114,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 11, + "line": 13, "command": "target_link_libraries", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json index 8d5faf8c23..11738b80bf 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_shared_lib.json @@ -16,7 +16,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 9, + "line": 11, "command": "add_library", "hasParent": true }, @@ -69,7 +69,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 9, + "line": 11, "command": "add_library", "hasParent": true }, @@ -118,7 +118,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -148,7 +148,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -178,7 +178,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 51, + "line": 53, "command": "install", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json index df43319c79..6f636df4db 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_exe.json @@ -16,7 +16,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 14, + "line": 16, "command": "add_executable", "hasParent": true }, @@ -64,7 +64,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 14, + "line": 16, "command": "add_executable", "hasParent": true }, @@ -114,7 +114,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 15, + "line": 17, "command": "target_link_libraries", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json index 2220581fea..05312ca05b 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_static_lib.json @@ -16,7 +16,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 13, + "line": 15, "command": "add_library", "hasParent": true }, @@ -64,7 +64,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 13, + "line": 15, "command": "add_library", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json index a5bebcd735..2ab99c25f8 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/c_subdir.json @@ -89,7 +89,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 17, + "line": 19, "command": "add_library", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json index 73f93467b6..16a86c7271 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_exe.json @@ -139,7 +139,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 43, + "line": 45, "command": "install", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json index 2274e4580c..f3624d4d5e 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/cxx_shared_lib.json @@ -94,7 +94,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -124,7 +124,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 46, + "line": 48, "command": "install", "hasParent": true }, @@ -154,7 +154,7 @@ "backtrace": [ { "file": "^codemodel-v2\\.cmake$", - "line": 51, + "line": 53, "command": "install", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json index 5b47814835..e737de54aa 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json +++ b/Tests/RunCMake/FileAPI/codemodel-v2-data/targets/interface_exe.json @@ -28,7 +28,7 @@ }, { "file": "^codemodel-v2\\.cmake$", - "line": 3, + "line": 5, "command": "include", "hasParent": true }, @@ -91,7 +91,7 @@ }, { "file": "^codemodel-v2\\.cmake$", - "line": 3, + "line": 5, "command": "include", "hasParent": true }, @@ -134,7 +134,7 @@ }, { "file": "^codemodel-v2\\.cmake$", - "line": 3, + "line": 5, "command": "include", "hasParent": true }, diff --git a/Tests/RunCMake/FileAPI/codemodel-v2.cmake b/Tests/RunCMake/FileAPI/codemodel-v2.cmake index 5f4019db06..c493ce1f8d 100644 --- a/Tests/RunCMake/FileAPI/codemodel-v2.cmake +++ b/Tests/RunCMake/FileAPI/codemodel-v2.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + include("${CMAKE_CURRENT_LIST_DIR}/include_test.cmake") add_library(c_lib empty.c) diff --git a/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX-imported-target.cmake b/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX-imported-target.cmake index ddf38874d8..6aa01f4883 100644 --- a/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX-imported-target.cmake +++ b/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX-imported-target.cmake @@ -1,5 +1,7 @@ enable_language (C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + set (win_platforms Windows CYGWIN MSYS) set (GENERATE_CONTENT [[ diff --git a/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX.cmake b/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX.cmake index 9c5d9322ed..4f380763bc 100644 --- a/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX.cmake +++ b/Tests/RunCMake/GenEx-TARGET_FILE/TARGET_FILE_SUFFIX.cmake @@ -1,5 +1,7 @@ enable_language (C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + set (win_platforms Windows CYGWIN MSYS) set (GENERATE_CONTENT [[ diff --git a/Tests/RunCMake/GenEx-TARGET_IMPORT_FILE/TARGET_SONAME_IMPORT_FILE.cmake b/Tests/RunCMake/GenEx-TARGET_IMPORT_FILE/TARGET_SONAME_IMPORT_FILE.cmake index 02ba513759..38dae3c436 100644 --- a/Tests/RunCMake/GenEx-TARGET_IMPORT_FILE/TARGET_SONAME_IMPORT_FILE.cmake +++ b/Tests/RunCMake/GenEx-TARGET_IMPORT_FILE/TARGET_SONAME_IMPORT_FILE.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + set (GENERATE_CONTENT [[ macro (CHECK_VALUE test_msg value expected) if (NOT "${value}" STREQUAL "${expected}") diff --git a/Tests/RunCMake/install/TARGETS-Defaults-Cache.cmake b/Tests/RunCMake/install/TARGETS-Defaults-Cache.cmake index 58c5273309..ddf94cc973 100644 --- a/Tests/RunCMake/install/TARGETS-Defaults-Cache.cmake +++ b/Tests/RunCMake/install/TARGETS-Defaults-Cache.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + add_executable(exe main.c) add_library(lib1 SHARED obj1.c) set_property(TARGET lib1 PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/obj3.h) diff --git a/Tests/RunCMake/install/TARGETS-Defaults.cmake b/Tests/RunCMake/install/TARGETS-Defaults.cmake index a580657976..5c3dfde2f2 100644 --- a/Tests/RunCMake/install/TARGETS-Defaults.cmake +++ b/Tests/RunCMake/install/TARGETS-Defaults.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + add_executable(exe main.c) add_library(lib1 SHARED obj1.c) set_property(TARGET lib1 PROPERTY PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/obj3.h) diff --git a/Tests/RunCMake/install/TARGETS-NAMELINK_COMPONENT.cmake b/Tests/RunCMake/install/TARGETS-NAMELINK_COMPONENT.cmake index 0e684e1846..2195706bf8 100644 --- a/Tests/RunCMake/install/TARGETS-NAMELINK_COMPONENT.cmake +++ b/Tests/RunCMake/install/TARGETS-NAMELINK_COMPONENT.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + macro(add_versioned_library NAME) add_library(${NAME} SHARED obj1.c) set_target_properties(${NAME} PROPERTIES diff --git a/Tests/RunCMake/install/TARGETS-OUTPUT_NAME.cmake b/Tests/RunCMake/install/TARGETS-OUTPUT_NAME.cmake index 67e7069411..58a7fe0882 100644 --- a/Tests/RunCMake/install/TARGETS-OUTPUT_NAME.cmake +++ b/Tests/RunCMake/install/TARGETS-OUTPUT_NAME.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + add_executable(test1 main.c) set_property(TARGET test1 PROPERTY OUTPUT_NAME test1out) set_property(TARGET test1 PROPERTY RELEASE_OUTPUT_NAME test1rel) diff --git a/Tests/RunCMake/target_link_libraries-ALIAS/AliasTargets.cmake b/Tests/RunCMake/target_link_libraries-ALIAS/AliasTargets.cmake index 65c708c631..c84d7291ce 100644 --- a/Tests/RunCMake/target_link_libraries-ALIAS/AliasTargets.cmake +++ b/Tests/RunCMake/target_link_libraries-ALIAS/AliasTargets.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + add_library (func SHARED func.c) set (binary_dir "${CMAKE_BINARY_DIR}") diff --git a/Tests/RunCMake/target_link_libraries-LINK_GROUP/LINK_GROUP.cmake b/Tests/RunCMake/target_link_libraries-LINK_GROUP/LINK_GROUP.cmake index fea2f917a1..1179c697ba 100644 --- a/Tests/RunCMake/target_link_libraries-LINK_GROUP/LINK_GROUP.cmake +++ b/Tests/RunCMake/target_link_libraries-LINK_GROUP/LINK_GROUP.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + # ensure command line is always displayed and do not use any response file set(CMAKE_VERBOSE_MAKEFILE TRUE) set(CMAKE_C_USE_RESPONSE_FILE_FOR_LIBRARIES FALSE) diff --git a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake index 0aa11be3fd..86e4c34c29 100644 --- a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake +++ b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY.cmake @@ -1,5 +1,7 @@ enable_language(C) +set(CMAKE_AIX_SHARED_LIBRARY_ARCHIVE 0) + if(CMP0156 STREQUAL "NEW") cmake_policy(SET CMP0156 NEW) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/LIBRARIES_PROCESSING.cmake" "set(CMAKE_C_LINK_LIBRARIES_PROCESSING \"${CMAKE_C_LINK_LIBRARIES_PROCESSING}\")\n")