From 440dce2d4e0c526d78b376055a3b33f8750e6fcf Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 14:00:20 +0200 Subject: [PATCH 01/27] opt in into subset of tests for browser on coreCLR --- src/tests/CMakeLists.txt | 56 +++++++++++++++--------- src/tests/JIT/interpreter/CMakeLists.txt | 6 ++- src/tests/JIT/interpreter/Interpreter.cs | 25 ++++++++--- 3 files changed, 58 insertions(+), 29 deletions(-) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 48440806fbea55..71a11e9eec0fde 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -41,26 +41,40 @@ if (CLR_CMAKE_HOST_WIN32) set_property(DIRECTORY PROPERTY CLR_EH_OPTION /EHa) # enable C++ EH (w/ SEH exceptions) endif() -MACRO(SUBDIRLIST result curdir) - FILE(GLOB children RELATIVE ${curdir} ${curdir}/*) - SET(dirlist "") - FOREACH(child ${children}) - IF(IS_DIRECTORY ${curdir}/${child}) - LIST(APPEND dirlist ${child}) - ENDIF() - ENDFOREACH() - SET(${result} ${dirlist}) -ENDMACRO() - -MACRO(ADDSUBDIR_REC curdir) - SUBDIRLIST(SUB_DIRS ${curdir}) - FOREACH(subdir ${SUB_DIRS}) - if(EXISTS "${curdir}/${subdir}/CMakeLists.txt") - ADD_SUBDIRECTORY(${curdir}/${subdir}) - else() - ADDSUBDIR_REC(${curdir}/${subdir}) - endif(EXISTS "${curdir}/${subdir}/CMakeLists.txt") +if(NOT CLR_CMAKE_TARGET_ARCH_WASM) + MACRO(SUBDIRLIST result curdir) + FILE(GLOB children RELATIVE ${curdir} ${curdir}/*) + SET(dirlist "") + FOREACH(child ${children}) + IF(IS_DIRECTORY ${curdir}/${child}) + LIST(APPEND dirlist ${child}) + ENDIF() ENDFOREACH() -ENDMACRO() + SET(${result} ${dirlist}) + ENDMACRO() + + MACRO(ADDSUBDIR_REC curdir) + SUBDIRLIST(SUB_DIRS ${curdir}) + FOREACH(subdir ${SUB_DIRS}) + if(EXISTS "${curdir}/${subdir}/CMakeLists.txt") + ADD_SUBDIRECTORY(${curdir}/${subdir}) + else() + ADDSUBDIR_REC(${curdir}/${subdir}) + endif(EXISTS "${curdir}/${subdir}/CMakeLists.txt") + ENDFOREACH() + ENDMACRO() + ADDSUBDIR_REC("${CMAKE_CURRENT_SOURCE_DIR}") +else() + set(STATIC_LIBS_ONLY 1) -ADDSUBDIR_REC("${CMAKE_CURRENT_SOURCE_DIR}") + add_compile_options( + -fwasm-exceptions + -msimd128) + add_link_options( + -fwasm-exceptions + -msimd128 + ) + + # opt in into tests that make sense for WASM + add_subdirectory(JIT/interpreter) +endif() diff --git a/src/tests/JIT/interpreter/CMakeLists.txt b/src/tests/JIT/interpreter/CMakeLists.txt index 8370c4824a523b..d13e359372bf41 100644 --- a/src/tests/JIT/interpreter/CMakeLists.txt +++ b/src/tests/JIT/interpreter/CMakeLists.txt @@ -5,7 +5,11 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES pinvoke.cpp) # add the executable -add_library (pinvoke SHARED ${SOURCES}) +if (STATIC_LIBS_ONLY) + add_library (pinvoke STATIC ${SOURCES}) +else () + add_library (pinvoke SHARED ${SOURCES}) +endif () # add the install targets install (TARGETS pinvoke DESTINATION bin) diff --git a/src/tests/JIT/interpreter/Interpreter.cs b/src/tests/JIT/interpreter/Interpreter.cs index 64cecb59b8ac0f..7ab4fc9886c637 100644 --- a/src/tests/JIT/interpreter/Interpreter.cs +++ b/src/tests/JIT/interpreter/Interpreter.cs @@ -723,6 +723,13 @@ static void EnsureCallingConventionTestTargetMethodsAreJitted() static int Main(string[] args) { + // WASM-TODO this is just hello world for now + if (RuntimeInformation.ProcessArchitecture == Architecture.Wasm) + { + Console.WriteLine("WASM-TODO: Interpreter tests"); + return 0; + } + jitField1 = 42; jitField2 = 43; @@ -2406,15 +2413,19 @@ static object BoxedSubtraction(object lhs, object rhs) public static bool TestPInvoke() { - if (sumTwoInts(1, 2) != 3) - return false; + // WASM-TODO enable once we have generated pinvoke and in-tree native re-link + if (RuntimeInformation.ProcessArchitecture != Architecture.Wasm) + { + if (sumTwoInts(1, 2) != 3) + return false; - double summed = sumTwoDoubles(1, 2); - if (summed != 3) - return false; + double summed = sumTwoDoubles(1, 2); + if (summed != 3) + return false; - // Test marshaling wrappers - writeToStdout("Hello world from pinvoke.dll!writeToStdout\n"); + // Test marshaling wrappers + writeToStdout("Hello world from pinvoke.dll!writeToStdout\n"); + } bool caught = false; try { From ce7e731148f0b1ee4b8aa50ab195e6f2ce6e46d8 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 14:02:58 +0200 Subject: [PATCH 02/27] fix src/tests/build.cmd --- src/tests/build.cmd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tests/build.cmd b/src/tests/build.cmd index c500bcb1cc30d4..f352eb367ba979 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -72,6 +72,9 @@ if /i "%1" == "--" (set processedArgs=!processedArgs! %1&s if /i "%1" == "x64" (set __BuildArch=x64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "x86" (set __BuildArch=x86&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "arm64" (set __BuildArch=arm64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "wasm" (set __BuildArch=wasm&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) + +if /i "%1" == "browser" (set __TargetOS=browser&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "debug" (set __BuildType=Debug&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "release" (set __BuildType=Release&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) From 5c2a3cfb22e2c0f9b2c6528779328b2786388a53 Mon Sep 17 00:00:00 2001 From: Pavel Savara Date: Fri, 3 Oct 2025 15:09:00 +0200 Subject: [PATCH 03/27] Update src/tests/build.cmd Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com> --- src/tests/build.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/build.cmd b/src/tests/build.cmd index f352eb367ba979..776013dfa588ec 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -75,6 +75,7 @@ if /i "%1" == "arm64" (set __BuildArch=arm64&set processedArg if /i "%1" == "wasm" (set __BuildArch=wasm&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "browser" (set __TargetOS=browser&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "wasi" (set __TargetOS=wasi&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "debug" (set __BuildType=Debug&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "release" (set __BuildType=Release&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) From 0a9d6a5307247cfe88a629ed35231741980d1e89 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 16:13:56 +0200 Subject: [PATCH 04/27] feedback --- src/tests/CMakeLists.txt | 3 +- .../Common/hostpolicymock/CMakeLists.txt | 2 +- .../Exceptions/ForeignThread/CMakeLists.txt | 2 +- .../ArrayMarshalling/BoolArray/CMakeLists.txt | 2 +- .../ArrayMarshalling/SafeArray/CMakeLists.txt | 2 +- .../Interop/BestFitMapping/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../ComWrappers/WeakReference/CMakeLists.txt | 2 +- .../Interop/COM/Dynamic/Server/CMakeLists.txt | 2 +- .../Interop/COM/NativeServer/CMakeLists.txt | 2 +- .../DisabledRuntimeMarshalling/CMakeLists.txt | 2 +- .../DllImportPath/CMakeLists.txt | 8 +++--- .../ExactSpelling/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +-- .../Interop/ExecInDefAppDom/CMakeLists.txt | 2 +- .../FuncPtrAsDelegateParam/CMakeLists.txt | 2 +- src/tests/Interop/GCBridge/CMakeLists.txt | 2 +- .../ConflictingNames/CMakeLists.txt | 2 +- .../Primitives/CMakeLists.txt | 2 +- .../CopyConstructorMarshaler/CMakeLists.txt | 2 +- .../IjwNativeCallingManagedDll/CMakeLists.txt | 2 +- .../Interop/IJW/IjwNativeDll/CMakeLists.txt | 2 +- .../Interop/IJW/NativeVarargs/CMakeLists.txt | 2 +- .../Interop/IJW/ijwhostmock/CMakeLists.txt | 2 +- src/tests/Interop/LayoutClass/CMakeLists.txt | 2 +- .../MarshalAPI/FunctionPointer/CMakeLists.txt | 2 +- .../mono-embedding-api-test/CMakeLists.txt | 2 +- .../NativeLibraryToLoad/CMakeLists.txt | 6 ++-- .../ObjectiveC/AutoReleaseTest/CMakeLists.txt | 2 +- .../ObjectiveCMarshalAPI/CMakeLists.txt | 2 +- .../LPArrayNative/CMakeLists.txt | 2 +- .../LPArrayNative/CMakeLists.txt | 2 +- .../PInvoke/ArrayWithOffset/CMakeLists.txt | 2 +- .../Interop/PInvoke/AsAny/CMakeLists.txt | 2 +- .../PInvoke/Attributes/LCID/CMakeLists.txt | 2 +- .../BestFitMapping/Char/CMakeLists.txt | 2 +- .../BestFitMapping/LPStr/CMakeLists.txt | 2 +- .../PInvoke/CriticalHandles/CMakeLists.txt | 2 +- .../PInvoke/CustomMarshalers/CMakeLists.txt | 2 +- .../Interop/PInvoke/DateTime/CMakeLists.txt | 2 +- .../Interop/PInvoke/Decimal/CMakeLists.txt | 2 +- .../Interop/PInvoke/Delegate/CMakeLists.txt | 2 +- .../Interop/PInvoke/Generics/CMakeLists.txt | 2 +- .../PInvoke/IEnumerator/CMakeLists.txt | 2 +- .../Interop/PInvoke/Int128/CMakeLists.txt | 2 +- .../Miscellaneous/HandleRef/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../PInvoke/Primitives/Int/CMakeLists.txt | 2 +- .../PInvoke/Primitives/Pointer/CMakeLists.txt | 2 +- .../Primitives/RuntimeHandles/CMakeLists.txt | 2 +- .../PInvoke/SafeHandles/CMakeLists.txt | 2 +- .../PInvoke/SetLastError/CMakeLists.txt | 2 +- .../PInvoke/PassingByOut/CMakeLists.txt | 2 +- .../PInvoke/PassingByRef/CMakeLists.txt | 2 +- .../PassingByOut/CMakeLists.txt | 2 +- .../PassingByRef/CMakeLists.txt | 2 +- .../Interop/PInvoke/Varargs/CMakeLists.txt | 2 +- .../Interop/PInvoke/Variant/CMakeLists.txt | 2 +- .../PInvoke/Vector2_3_4/CMakeLists.txt | 2 +- .../PrimitiveMarshalling/Bool/CMakeLists.txt | 2 +- .../EnumMarshalling/CMakeLists.txt | 2 +- .../UIntPtr/CMakeLists.txt | 2 +- src/tests/Interop/RefCharArray/CMakeLists.txt | 2 +- src/tests/Interop/SimpleStruct/CMakeLists.txt | 2 +- .../StringMarshalling/AnsiBSTR/CMakeLists.txt | 2 +- .../StringMarshalling/BSTR/CMakeLists.txt | 2 +- .../StringMarshalling/LPSTR/CMakeLists.txt | 2 +- .../StringMarshalling/LPTSTR/CMakeLists.txt | 2 +- .../StringMarshalling/UTF8/CMakeLists.txt | 2 +- .../VBByRefStr/CMakeLists.txt | 2 +- .../StructMarshalling/PInvoke/CMakeLists.txt | 2 +- .../MarshalExpStruct/CMakeLists.txt | 2 +- .../MarshalSeqStruct/CMakeLists.txt | 2 +- .../SuppressGCTransition/CMakeLists.txt | 2 +- .../Interop/UnmanagedCallConv/CMakeLists.txt | 2 +- .../UnmanagedCallersOnly/CMakeLists.txt | 2 +- src/tests/JIT/Directed/Convert/CMakeLists.txt | 2 +- .../JIT/Directed/PrimitiveABI/CMakeLists.txt | 2 +- .../JIT/Directed/StructABI/CMakeLists.txt | 4 +-- .../Directed/aliasing_retbuf/CMakeLists.txt | 2 +- src/tests/JIT/Directed/arglist/CMakeLists.txt | 2 +- .../JIT/Directed/callconv/CMakeLists.txt | 8 +++--- .../pinning/object-pin/CMakeLists.txt | 2 +- src/tests/JIT/Directed/pinvoke/CMakeLists.txt | 2 +- src/tests/JIT/Directed/tls/CMakeLists.txt | 2 +- .../JIT/Methodical/gc_poll/CMakeLists.txt | 2 +- .../structs/systemvbringup/CMakeLists.txt | 2 +- .../JitBlue/Runtime_101046/CMakeLists.txt | 2 +- .../JitBlue/Runtime_76194/CMakeLists.txt | 2 +- .../V1.2-M02/b108129/CMakeLists.txt | 2 +- src/tests/JIT/SIMD/CMakeLists.txt | 2 +- src/tests/JIT/interpreter/CMakeLists.txt | 6 +--- .../JIT/jit64/hfa/main/dll/CMakeLists.txt | 8 +++--- .../JIT/jit64/mcc/interop/CMakeLists.txt | 28 +++++++++---------- src/tests/Loader/NativeLibs/CMakeLists.txt | 2 +- .../coreclr/GitHub_102887/CMakeLists.txt | 2 +- .../coreclr/GitHub_111242/CMakeLists.txt | 2 +- .../coreclr/GitHub_117393/CMakeLists.txt | 2 +- src/tests/baseservices/CET/CMakeLists.txt | 2 +- .../baseservices/callconvs/CMakeLists.txt | 2 +- .../Foreign/CMakeLists.txt | 2 +- .../PInvoke/CMakeLists.txt | 2 +- .../exceptioninterop/CMakeLists.txt | 2 +- .../regressions/Dev11/147911/CMakeLists.txt | 2 +- .../regressions/V1/SEH/VJ/CMakeLists.txt | 2 +- .../exceptions/unhandled/CMakeLists.txt | 2 +- .../SmokeTests/ComWrappers/CMakeLists.txt | 2 +- .../SmokeTests/PInvoke/CMakeLists.txt | 2 +- src/tests/profiler/native/CMakeLists.txt | 2 +- src/tests/readytorun/tests/CMakeLists.txt | 2 +- 111 files changed, 138 insertions(+), 141 deletions(-) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 71a11e9eec0fde..f4b6ca7ca60620 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -42,6 +42,7 @@ if (CLR_CMAKE_HOST_WIN32) endif() if(NOT CLR_CMAKE_TARGET_ARCH_WASM) + set(TEST_LIB_TYPE SHARED) MACRO(SUBDIRLIST result curdir) FILE(GLOB children RELATIVE ${curdir} ${curdir}/*) SET(dirlist "") @@ -65,7 +66,7 @@ if(NOT CLR_CMAKE_TARGET_ARCH_WASM) ENDMACRO() ADDSUBDIR_REC("${CMAKE_CURRENT_SOURCE_DIR}") else() - set(STATIC_LIBS_ONLY 1) + set(TEST_LIB_TYPE STATIC) add_compile_options( -fwasm-exceptions diff --git a/src/tests/Common/hostpolicymock/CMakeLists.txt b/src/tests/Common/hostpolicymock/CMakeLists.txt index ba75fe9e492141..d66e6e5d234f29 100644 --- a/src/tests/Common/hostpolicymock/CMakeLists.txt +++ b/src/tests/Common/hostpolicymock/CMakeLists.txt @@ -3,6 +3,6 @@ project (hostpolicy) include_directories(${INC_PLATFORM_DIR}) set(SOURCES HostpolicyMock.cpp ) -add_library(hostpolicy SHARED ${SOURCES}) +add_library(hostpolicy ${TEST_LIB_TYPE} ${SOURCES}) install(TARGETS hostpolicy DESTINATION bin) diff --git a/src/tests/Exceptions/ForeignThread/CMakeLists.txt b/src/tests/Exceptions/ForeignThread/CMakeLists.txt index c4e86f63ebad34..bdbd576631e3d9 100644 --- a/src/tests/Exceptions/ForeignThread/CMakeLists.txt +++ b/src/tests/Exceptions/ForeignThread/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (ForeignThreadExceptionsNative SHARED ${SOURCES}) +add_library (ForeignThreadExceptionsNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS ForeignThreadExceptionsNative DESTINATION bin) diff --git a/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt b/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt index 47a1e9189dd06f..392928be2c67c0 100644 --- a/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt +++ b/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES MarshalBoolArrayNative.cpp) # add the executable -add_library (MarshalBoolArrayNative SHARED ${SOURCES}) +add_library (MarshalBoolArrayNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(MarshalBoolArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt b/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt index 711e43d181dceb..d297944a85b09a 100644 --- a/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt +++ b/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SafeArrayNative.cpp RecordNative.cpp) # add the executable -add_library (SafeArrayNative SHARED ${SOURCES}) +add_library (SafeArrayNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(SafeArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/BestFitMapping/CMakeLists.txt b/src/tests/Interop/BestFitMapping/CMakeLists.txt index a9f2700c79dae5..d96a95a05ce485 100644 --- a/src/tests/Interop/BestFitMapping/CMakeLists.txt +++ b/src/tests/Interop/BestFitMapping/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES BestFitMappingNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (BestFitMappingNative SHARED ${SOURCES}) +add_library (BestFitMappingNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(BestFitMappingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt b/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt index ec0104a9d381e2..e6439cb606a6fb 100644 --- a/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt +++ b/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES ReferenceTrackerRuntime.cpp) # add the shared library -add_library (MockReferenceTrackerRuntime SHARED ${SOURCES}) +add_library (MockReferenceTrackerRuntime ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(MockReferenceTrackerRuntime PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt b/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt index 25c32ec842ac0e..0e54f47f6edd22 100644 --- a/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt +++ b/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES WeakReferenceNative.cpp) # add the shared library -add_library (WeakReferenceNative SHARED ${SOURCES}) +add_library (WeakReferenceNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(WeakReferenceNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt b/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt index befba2383cee81..6a41ea40f3a0e3 100644 --- a/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt +++ b/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt @@ -33,7 +33,7 @@ if (CLR_CMAKE_HOST_WIN32) endif() # add the shared library -add_library (${PROJECT_NAME} SHARED ${SOURCES}) +add_library (${PROJECT_NAME} ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # Copy manifest file to project output diff --git a/src/tests/Interop/COM/NativeServer/CMakeLists.txt b/src/tests/Interop/COM/NativeServer/CMakeLists.txt index 33d81d4ee4ce68..f666c91bb6bf53 100644 --- a/src/tests/Interop/COM/NativeServer/CMakeLists.txt +++ b/src/tests/Interop/COM/NativeServer/CMakeLists.txt @@ -9,7 +9,7 @@ if (CLR_CMAKE_HOST_WIN32) endif() # add the shared library -add_library (COMNativeServer SHARED ${SOURCES}) +add_library (COMNativeServer ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(COMNativeServer PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # Copy manifest file to project output diff --git a/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt b/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt index 20c98adc3cd431..c6fabe4da6e526 100644 --- a/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt +++ b/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES DisabledRuntimeMarshallingNative.cpp ) # add the executable -add_library (DisabledRuntimeMarshallingNative SHARED ${SOURCES}) +add_library (DisabledRuntimeMarshallingNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(DisabledRuntimeMarshallingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt b/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt index 6718e38aa0f9e1..88cce20c26d172 100644 --- a/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt +++ b/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt @@ -6,10 +6,10 @@ set(SOURCES # Additional files to reference: # add the executable -add_library (DllImportPath_Local SHARED ${SOURCES}) -add_library (DllImportPath.Local SHARED ${SOURCES}) -add_library (DllImportPath_PathEnv SHARED ${SOURCES}) -add_library (DllImportPath_Relative SHARED ${SOURCES}) +add_library (DllImportPath_Local ${TEST_LIB_TYPE} ${SOURCES}) +add_library (DllImportPath.Local ${TEST_LIB_TYPE} ${SOURCES}) +add_library (DllImportPath_PathEnv ${TEST_LIB_TYPE} ${SOURCES}) +add_library (DllImportPath_Relative ${TEST_LIB_TYPE} ${SOURCES}) add_executable(DllImportPath_ExeFile ${SOURCES}) target_link_libraries(DllImportPath_Local PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) target_link_libraries(DllImportPath.Local PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt b/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt index c491fd782cd398..b3f0a336436bf0 100644 --- a/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt +++ b/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt @@ -4,7 +4,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES ExactSpellingNative.cpp) # add the executable -add_library (ExactSpellingNative SHARED ${SOURCES}) +add_library (ExactSpellingNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(ExactSpellingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt b/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt index d10d89f1914cef..d9b318fa31befb 100644 --- a/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt +++ b/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt @@ -6,8 +6,8 @@ if (CLR_CMAKE_TARGET_WIN32) string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") endif () -add_library(Dependency SHARED Dependency.cpp) +add_library(Dependency ${TEST_LIB_TYPE} Dependency.cpp) target_link_libraries(Dependency PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) -add_library(NativeLibraryWithDependency SHARED NativeLibraryWithDependency.cpp) +add_library(NativeLibraryWithDependency ${TEST_LIB_TYPE} NativeLibraryWithDependency.cpp) target_link_libraries(NativeLibraryWithDependency PRIVATE Dependency ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt b/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt index 4287e19d5c8a1e..db3908ac6f5dea 100644 --- a/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt +++ b/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES ExecInDefAppDomDll.cpp ) # add the executable -add_library (ExecInDefAppDomDll SHARED ${SOURCES}) +add_library (ExecInDefAppDomDll ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(ExecInDefAppDomDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt b/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt index 0193a5357ea739..ace450488c40ad 100644 --- a/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt +++ b/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES FuncPtrAsDelegateParamNative.cpp ) # add the executable -add_library (FuncPtrAsDelegateParamNative SHARED ${SOURCES}) +add_library (FuncPtrAsDelegateParamNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(FuncPtrAsDelegateParamNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/GCBridge/CMakeLists.txt b/src/tests/Interop/GCBridge/CMakeLists.txt index 54245a91fb9a10..896e76ab357e17 100644 --- a/src/tests/Interop/GCBridge/CMakeLists.txt +++ b/src/tests/Interop/GCBridge/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES GCBridgeNative.cpp ) # add the executable -add_library (GCBridgeNative SHARED ${SOURCES}) +add_library (GCBridgeNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(GCBridgeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt b/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt index 3aa29f7767334e..93f032af3e56c3 100644 --- a/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt +++ b/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES CustomMarshalerNative.cpp ) # add the executable -add_library (CustomMarshalerNative SHARED ${SOURCES}) +add_library (CustomMarshalerNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(CustomMarshalerNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt b/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt index c539029f79c87e..394942bfc064c9 100644 --- a/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt +++ b/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES ICustomMarshalerNative.cpp ) # add the executable -add_library (CustomMarshalersPrimitives SHARED ${SOURCES}) +add_library (CustomMarshalersPrimitives ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(CustomMarshalersPrimitives PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt b/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt index d082f7c8b134bd..24b3f3cdd06eeb 100644 --- a/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt +++ b/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwCopyConstructorMarshaler.cpp) # add the shared library -add_library (IjwCopyConstructorMarshaler SHARED ${SOURCES}) +add_library (IjwCopyConstructorMarshaler ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(IjwCopyConstructorMarshaler PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) add_ijw_msbuild_project_properties(IjwCopyConstructorMarshaler ijwhost) diff --git a/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt b/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt index e29fbfeae3668e..f616d1108a7196 100644 --- a/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt +++ b/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwNativeCallingManagedDll.cpp) # add the shared library -add_library (IjwNativeCallingManagedDll SHARED ${SOURCES}) +add_library (IjwNativeCallingManagedDll ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(IjwNativeCallingManagedDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt b/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt index a8eee97b76437d..f96fc4d4a3c1ca 100644 --- a/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt +++ b/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwNativeDll.cpp) # add the shared library -add_library (IjwNativeDll SHARED ${SOURCES}) +add_library (IjwNativeDll ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(IjwNativeDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) add_ijw_msbuild_project_properties(IjwNativeDll ijwhost) diff --git a/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt b/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt index a3c7c973a6597d..8508da41a73345 100644 --- a/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt +++ b/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwNativeVarargs.cpp) # add the shared library -add_library (IjwNativeVarargs SHARED ${SOURCES}) +add_library (IjwNativeVarargs ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(IjwNativeVarargs PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) add_ijw_msbuild_project_properties(IjwNativeVarargs ijwhost) diff --git a/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt b/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt index db5aa92b2e8a8b..9a437872c0af49 100644 --- a/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt +++ b/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES ijwhost.cpp) # add the shared library -add_library (ijwhost SHARED ${SOURCES}) +add_library (ijwhost ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(ijwhost PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/LayoutClass/CMakeLists.txt b/src/tests/Interop/LayoutClass/CMakeLists.txt index 5f5cfe660501f8..74218f0bd51b54 100644 --- a/src/tests/Interop/LayoutClass/CMakeLists.txt +++ b/src/tests/Interop/LayoutClass/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES LayoutClassNative.cpp ) # add the executable -add_library (LayoutClassNative SHARED ${SOURCES}) +add_library (LayoutClassNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(LayoutClassNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt b/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt index 549f9dfcab606b..f46e7dee277cc3 100644 --- a/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt +++ b/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES FunctionPointerNative.cpp) # add the executable -add_library (FunctionPointerNative SHARED ${SOURCES}) +add_library (FunctionPointerNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(FunctionPointerNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt b/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt index 8c7b718beae86f..3f777ef70e594f 100644 --- a/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt +++ b/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(${INC_PLATFORM_DIR}) add_subdirectory(${CLR_SRC_NATIVE_DIR}/public public_api) # add the library -add_library (mono-embedding-api-test SHARED mono-embedding-api-test.c api-types.h api-functions.h) +add_library (mono-embedding-api-test ${TEST_LIB_TYPE} mono-embedding-api-test.c api-types.h api-functions.h) set_target_properties(mono-embedding-api-test PROPERTIES MSVC_WARNING_LEVEL 3) target_link_libraries(mono-embedding-api-test PRIVATE monoapi ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt b/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt index f64e2e89bf7b90..60e72dd587fe18 100644 --- a/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt +++ b/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt @@ -2,15 +2,15 @@ project (NativeLibrary) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the shared library -add_library (NativeLibrary SHARED NativeLibrary.cpp) +add_library (NativeLibrary ${TEST_LIB_TYPE} NativeLibrary.cpp) if (CLR_CMAKE_TARGET_UNIX) target_link_libraries(NativeLibrary PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) endif() # add the shared library -add_library (GlobalLoadHelper SHARED GlobalLoadHelper.cpp) +add_library (GlobalLoadHelper ${TEST_LIB_TYPE} GlobalLoadHelper.cpp) target_link_libraries(GlobalLoadHelper PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) -add_library (GloballyLoadedNativeLibrary SHARED GloballyLoadedNativeLibrary.cpp) +add_library (GloballyLoadedNativeLibrary ${TEST_LIB_TYPE} GloballyLoadedNativeLibrary.cpp) target_link_libraries(GloballyLoadedNativeLibrary PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt b/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt index 39417b1124c9d6..53b4c6585ea5a3 100644 --- a/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt +++ b/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt @@ -17,5 +17,5 @@ set_source_files_properties(autorelease.m PROPERTIES COMPILE_FLAGS -fno-objc-arc find_library(FOUNDATION Foundation REQUIRED) -add_library(ObjectiveC SHARED ${SOURCES}) +add_library(ObjectiveC ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(ObjectiveC PRIVATE ${FOUNDATION}) diff --git a/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt b/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt index bed745f3c1621c..ba73b7e3d565e0 100644 --- a/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt +++ b/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt @@ -9,7 +9,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES NativeObjCMarshalTests.cpp) # add the shared library -add_library (NativeObjCMarshalTests SHARED ${SOURCES}) +add_library (NativeObjCMarshalTests ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(NativeObjCMarshalTests PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt b/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt index 445d7c894c929c..60a11c0833d721 100644 --- a/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt @@ -8,7 +8,7 @@ set(SOURCES ) # add the executable -add_library (MarshalArrayByValArrayNative SHARED ${SOURCES}) +add_library (MarshalArrayByValArrayNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(MarshalArrayByValArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS MarshalArrayByValArrayNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt b/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt index e5a9e42bdf9f25..2e9b194ceda123 100644 --- a/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt @@ -7,7 +7,7 @@ set(SOURCES ) # add the executable -add_library (MarshalArrayLPArrayNative SHARED ${SOURCES}) +add_library (MarshalArrayLPArrayNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(MarshalArrayLPArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS MarshalArrayLPArrayNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt b/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt index 395b2013e137e8..57748a4a68f25a 100644 --- a/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt @@ -9,7 +9,7 @@ if(CLR_CMAKE_HOST_WIN32) ) endif(CLR_CMAKE_HOST_WIN32) # add the executable -add_library (ArrayWithOffsetNative SHARED ${SOURCES}) +add_library (ArrayWithOffsetNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(ArrayWithOffsetNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS ArrayWithOffsetNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt b/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt index fab42ef717cabc..368e92676813fe 100644 --- a/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt @@ -9,7 +9,7 @@ if(CLR_CMAKE_HOST_WIN32) ) endif(CLR_CMAKE_HOST_WIN32) # add the executable -add_library (AsAnyNative SHARED ${SOURCES}) +add_library (AsAnyNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(AsAnyNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS AsAnyNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt b/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt index bd6556422c91f0..018c00a793e9eb 100644 --- a/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES LCIDNative.cpp ) -add_library (LCIDNative SHARED ${SOURCES}) +add_library (LCIDNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(LCIDNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS LCIDNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt b/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt index af0dd5f83e99f1..3c00037ff7b9f2 100644 --- a/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt @@ -4,7 +4,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES BestFitMappingNative.cpp ) -add_library (Char_BestFitMappingNative SHARED ${SOURCES}) +add_library (Char_BestFitMappingNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(Char_BestFitMappingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS Char_BestFitMappingNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt b/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt index a2802113f30163..fd07f1e6ef9e32 100644 --- a/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES BestFitMappingNative.cpp ) -add_library (LPStr_BestFitMappingNative SHARED ${SOURCES}) +add_library (LPStr_BestFitMappingNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(LPStr_BestFitMappingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS LPStr_BestFitMappingNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt b/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt index ce827099c4d7bd..0b0bc3d96fa09e 100644 --- a/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES CriticalHandlesNative.cpp ) # add the executable -add_library (CriticalHandlesNative SHARED ${SOURCES}) +add_library (CriticalHandlesNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(CriticalHandlesNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS CriticalHandlesNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt b/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt index 31c3fc87be7d7b..10aa58f20754e0 100644 --- a/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES CustomMarshalersNative.cpp ) # add the executable -add_library (CustomMarshalersNative SHARED ${SOURCES}) +add_library (CustomMarshalersNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(CustomMarshalersNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt b/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt index 6010a0b00d57e4..c0a68b2655eeb0 100644 --- a/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt @@ -4,7 +4,7 @@ set(SOURCES NativeDateTime.cpp ) # add the executable -add_library (NativeDateTime SHARED ${SOURCES}) +add_library (NativeDateTime ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(NativeDateTime PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS NativeDateTime DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt b/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt index cad9c50f07f6e0..01b2ff3f2c175d 100644 --- a/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt @@ -3,6 +3,6 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES DecimalTestNative.cpp ) -add_library (DecimalTestNative SHARED ${SOURCES}) +add_library (DecimalTestNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(DecimalTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) install (TARGETS DecimalTestNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt b/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt index 92aaf73d67931f..e56e1b2dbc5002 100644 --- a/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt @@ -9,5 +9,5 @@ if (CLR_CMAKE_TARGET_WIN32) endif() # add the executable -add_library (DelegateTestNative SHARED ${SOURCES}) +add_library (DelegateTestNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(DelegateTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/PInvoke/Generics/CMakeLists.txt b/src/tests/Interop/PInvoke/Generics/CMakeLists.txt index 62baff4017164c..7ee6704f85dfff 100644 --- a/src/tests/Interop/PInvoke/Generics/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Generics/CMakeLists.txt @@ -73,5 +73,5 @@ set(SOURCES GenericsNative.VectorL.cpp GenericsNative.VectorU.cpp ) -add_library (GenericsNative SHARED ${SOURCES}) +add_library (GenericsNative ${TEST_LIB_TYPE} ${SOURCES}) install (TARGETS GenericsNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt b/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt index 0c303cfc982763..35362086c9da22 100644 --- a/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES IEnumeratorNative.cpp ) # add the executable -add_library (IEnumeratorNative SHARED ${SOURCES}) +add_library (IEnumeratorNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(IEnumeratorNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Int128/CMakeLists.txt b/src/tests/Interop/PInvoke/Int128/CMakeLists.txt index 17690db349b4b0..f385a86da1d7b0 100644 --- a/src/tests/Interop/PInvoke/Int128/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Int128/CMakeLists.txt @@ -4,5 +4,5 @@ set(SOURCES Int128Native.cpp UInt128Native.cpp ) -add_library (Int128Native SHARED ${SOURCES}) +add_library (Int128Native ${TEST_LIB_TYPE} ${SOURCES}) install (TARGETS Int128Native DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt b/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt index e4975485c62510..84a5e56ad56fd3 100644 --- a/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt @@ -7,6 +7,6 @@ set(SOURCES # Additional files to reference: # HandleRefNative.def # add the executable -add_library (HandleRefNative SHARED ${SOURCES}) +add_library (HandleRefNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS HandleRefNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt b/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt index fb6e84958422d1..bf0a952a1b8112 100644 --- a/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt @@ -5,6 +5,6 @@ set(SOURCES MAWSPINative.cpp ) # add the executable -add_library (MAWSPINative SHARED ${SOURCES}) +add_library (MAWSPINative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS MAWSPINative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt b/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt index 924b6a8f7f32e2..bcb93a5a7ff4fa 100644 --- a/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt @@ -6,6 +6,6 @@ set(SOURCES ) # Additional files to reference: # add the executable -add_library (ComVisibleNative SHARED ${SOURCES}) +add_library (ComVisibleNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS ComVisibleNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt b/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt index 25cfea57d8c618..c74d70fb2bc1e0 100644 --- a/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt @@ -1,6 +1,6 @@ project (PInvokeIntNative) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES PInvokeIntNative.cpp) -add_library (PInvokeIntNative SHARED ${SOURCES}) +add_library (PInvokeIntNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS PInvokeIntNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt b/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt index 0d8bf6e334e20d..4f6240d6be0d22 100644 --- a/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt @@ -2,5 +2,5 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES PointerNative.cpp ) -add_library (PointerNative SHARED ${SOURCES}) +add_library (PointerNative ${TEST_LIB_TYPE} ${SOURCES}) install (TARGETS PointerNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt b/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt index 9b22fecb263478..acbd7c25b54f1f 100644 --- a/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt @@ -1,6 +1,6 @@ project (RuntimeHandlesNative) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES RuntimeHandlesNative.cpp) -add_library (RuntimeHandlesNative SHARED ${SOURCES}) +add_library (RuntimeHandlesNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS RuntimeHandlesNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt b/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt index da7391f4035305..115d1e6ceebb26 100644 --- a/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt @@ -3,6 +3,6 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SafeHandleNative.cpp ) -add_library (SafeHandleNative SHARED ${SOURCES}) +add_library (SafeHandleNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(SafeHandleNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) install (TARGETS SafeHandleNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt b/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt index 6cc6928999aff5..d24a36a7e92114 100644 --- a/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt @@ -3,7 +3,7 @@ include("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SetLastErrorNative.cpp) # add the shared library -add_library(SetLastErrorNative SHARED ${SOURCES}) +add_library(SetLastErrorNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(SetLastErrorNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt index 2bbda0182f716d..9be08dad4a2888 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES PInvokePassingByOutNative.cpp ) # add the executable -add_library (PInvokePassingByOutNative SHARED ${SOURCES}) +add_library (PInvokePassingByOutNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(PInvokePassingByOutNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS PInvokePassingByOutNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt index bf9d8c9c288550..dbeb22196363d4 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES PInvokePassingByRefNative.cpp ) # add the executable -add_library (PInvokePassingByRefNative SHARED ${SOURCES}) +add_library (PInvokePassingByRefNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(PInvokePassingByRefNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS PInvokePassingByRefNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt index 65df81bce9f71d..693c990be39853 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt @@ -6,7 +6,7 @@ set(SOURCES ) # Additional files to reference: # add the executable -add_library (RPIP_ByOutNative SHARED ${SOURCES}) +add_library (RPIP_ByOutNative ${TEST_LIB_TYPE} ${SOURCES}) set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative) target_link_libraries(RPIP_ByOutNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt index bfac0325b011a9..ca25eb8307e979 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt @@ -6,7 +6,7 @@ set(SOURCES ) # Additional files to reference: # add the executable -add_library (RPIP_ByRefNative SHARED ${SOURCES}) +add_library (RPIP_ByRefNative ${TEST_LIB_TYPE} ${SOURCES}) set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative) target_link_libraries(RPIP_ByRefNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt b/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt index b4f45d0f342fd7..57303a20354429 100644 --- a/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES VarargsNative.cpp ) # add the executable -add_library (VarargsNative SHARED ${SOURCES}) +add_library (VarargsNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(VarargsNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Variant/CMakeLists.txt b/src/tests/Interop/PInvoke/Variant/CMakeLists.txt index 2cfedc6573bef1..d89db6ed9b5682 100644 --- a/src/tests/Interop/PInvoke/Variant/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Variant/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES VariantNative.cpp) # add the executable -add_library (VariantNative SHARED ${SOURCES}) +add_library (VariantNative ${TEST_LIB_TYPE} ${SOURCES}) if(CLR_CMAKE_HOST_WIN32) list(APPEND LINK_LIBRARIES_ADDITIONAL diff --git a/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt b/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt index 285855cf24ca8d..53e94b0bd896c4 100644 --- a/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt @@ -3,6 +3,6 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES Vector2_3_4TestNative.cpp ) -add_library (Vector2_3_4TestNative SHARED ${SOURCES}) +add_library (Vector2_3_4TestNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(Vector2_3_4TestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) install (TARGETS Vector2_3_4TestNative DESTINATION bin) diff --git a/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt b/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt index 9e3d9515f5d54e..ecd1c463882608 100644 --- a/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt +++ b/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES BoolNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (BoolNative SHARED ${SOURCES}) +add_library (BoolNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(BoolNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) #get_cmake_property(_variableNames VARIABLES) diff --git a/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt b/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt index a90046bcc99544..6c078b21717da6 100644 --- a/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt +++ b/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES MarshalEnumNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (MarshalEnumNative SHARED ${SOURCES}) +add_library (MarshalEnumNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(MarshalEnumNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt b/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt index 1d38872d792cdc..db646d259171ba 100644 --- a/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt +++ b/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES UIntPtrNative.cpp ) # add the executable -add_library (UIntPtrNative SHARED ${SOURCES}) +add_library (UIntPtrNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(UIntPtrNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/RefCharArray/CMakeLists.txt b/src/tests/Interop/RefCharArray/CMakeLists.txt index aa6105e15a07a1..0188b1c09596b0 100644 --- a/src/tests/Interop/RefCharArray/CMakeLists.txt +++ b/src/tests/Interop/RefCharArray/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES RefCharArrayNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (RefCharArrayNative SHARED ${SOURCES}) +add_library (RefCharArrayNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(RefCharArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/SimpleStruct/CMakeLists.txt b/src/tests/Interop/SimpleStruct/CMakeLists.txt index b3d50930d867e5..4e8308adb1e78b 100644 --- a/src/tests/Interop/SimpleStruct/CMakeLists.txt +++ b/src/tests/Interop/SimpleStruct/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SimpleStructNative.cpp ) # add the executable -add_library (SimpleStructNative SHARED ${SOURCES}) +add_library (SimpleStructNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(SimpleStructNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt index 2e8b2fb2270f04..1bba75363efff5 100644 --- a/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES AnsiBStrTestNative.cpp) # add the executable -add_library (AnsiBStrTestNative SHARED ${SOURCES}) +add_library (AnsiBStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) if(CLR_CMAKE_HOST_WIN32) list(APPEND LINK_LIBRARIES_ADDITIONAL diff --git a/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt index 226f128f400bbb..69df3faf7b24d5 100644 --- a/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt @@ -2,7 +2,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES BStrTestNative.cpp) # add the executable -add_library (BStrTestNative SHARED ${SOURCES}) +add_library (BStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) if(CLR_CMAKE_HOST_WIN32) list(APPEND LINK_LIBRARIES_ADDITIONAL diff --git a/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt index 6f5e933def9d5f..a7692141f9cf4c 100644 --- a/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt @@ -2,7 +2,7 @@ set(SOURCES LPStrTestNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (LPStrTestNative SHARED ${SOURCES}) +add_library (LPStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(LPStrTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt index a3c838faf4565d..87c71d92db5f07 100644 --- a/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt @@ -2,7 +2,7 @@ set(SOURCES LPTStrTestNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (LPTStrTestNative SHARED ${SOURCES}) +add_library (LPTStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(LPTStrTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt b/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt index dd50b710457224..6d41c7f700a2dd 100644 --- a/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES UTF8TestNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (UTF8TestNative SHARED ${SOURCES}) +add_library (UTF8TestNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(UTF8TestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt b/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt index 79039283d55f57..471d53298e492b 100644 --- a/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES VBByRefStrNative.cpp ) # add the executable -add_library (VBByRefStrNative SHARED ${SOURCES}) +add_library (VBByRefStrNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(VBByRefStrNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt b/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt index 199e1d9440df8e..07782905a63656 100644 --- a/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt +++ b/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES MarshalStructAsParamDLL.cpp) # add the executable -add_library (MarshalStructAsParam SHARED ${SOURCES}) +add_library (MarshalStructAsParam ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(MarshalStructAsParam PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt index b27d067e33a8ae..9ede9b607a38ba 100644 --- a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt +++ b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES ExpStructAsParamNative.cpp ) # add the executable -add_library (ReversePInvokeNative SHARED ${SOURCES}) +add_library (ReversePInvokeNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(ReversePInvokeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS ReversePInvokeNative DESTINATION bin) diff --git a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt index 8a9f9c23f99a38..0155d892653cbd 100644 --- a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt +++ b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SeqStructDelRevPInvokeNative.cpp ) -add_library (SeqPInvokeNative SHARED ${SOURCES}) +add_library (SeqPInvokeNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(SeqPInvokeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS SeqPInvokeNative DESTINATION bin) diff --git a/src/tests/Interop/SuppressGCTransition/CMakeLists.txt b/src/tests/Interop/SuppressGCTransition/CMakeLists.txt index 663b8e5d440113..9d278d1972bfd7 100644 --- a/src/tests/Interop/SuppressGCTransition/CMakeLists.txt +++ b/src/tests/Interop/SuppressGCTransition/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SuppressGCTransitionNative.cpp ) -add_library (SuppressGCTransitionNative SHARED ${SOURCES}) +add_library (SuppressGCTransitionNative ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(SuppressGCTransitionNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS SuppressGCTransitionNative DESTINATION bin) diff --git a/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt b/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt index 93a124bb5a54e0..23779084dea813 100644 --- a/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt +++ b/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt @@ -3,7 +3,7 @@ Include("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES UnmanagedCallConvNative.cpp ) # add the executable -add_library(${PROJECT_NAME} SHARED ${SOURCES}) +add_library(${PROJECT_NAME} ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt b/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt index 37e5fa5e669839..bf3cf8d070854a 100644 --- a/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt +++ b/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES UnmanagedCallersOnlyDll.cpp ) # add the executable -add_library (UnmanagedCallersOnlyDll SHARED ${SOURCES}) +add_library (UnmanagedCallersOnlyDll ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(UnmanagedCallersOnlyDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/JIT/Directed/Convert/CMakeLists.txt b/src/tests/JIT/Directed/Convert/CMakeLists.txt index 077085bd2e2399..0711fd1223dccf 100644 --- a/src/tests/JIT/Directed/Convert/CMakeLists.txt +++ b/src/tests/JIT/Directed/Convert/CMakeLists.txt @@ -2,7 +2,7 @@ project (out_of_range_fp_to_int_conversionsnative) include_directories(${INC_PLATFORM_DIR}) # add the executable -add_library (out_of_range_fp_to_int_conversionsnative SHARED out_of_range_fp_to_int_conversions.cpp) +add_library (out_of_range_fp_to_int_conversionsnative ${TEST_LIB_TYPE} out_of_range_fp_to_int_conversions.cpp) # add the install targets install (TARGETS out_of_range_fp_to_int_conversionsnative DESTINATION bin) diff --git a/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt b/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt index 20cb7991ed09ad..b6e052ae072e1a 100644 --- a/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt +++ b/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt @@ -7,6 +7,6 @@ else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Oz") endif() -add_library (PrimitiveABINative SHARED PrimitiveABI.c) +add_library (PrimitiveABINative ${TEST_LIB_TYPE} PrimitiveABI.c) install (TARGETS PrimitiveABINative DESTINATION bin) diff --git a/src/tests/JIT/Directed/StructABI/CMakeLists.txt b/src/tests/JIT/Directed/StructABI/CMakeLists.txt index cf028a3c8670e8..37442c2be92e33 100644 --- a/src/tests/JIT/Directed/StructABI/CMakeLists.txt +++ b/src/tests/JIT/Directed/StructABI/CMakeLists.txt @@ -9,8 +9,8 @@ else() endif() # add the executable -add_library (StructABILib SHARED StructABI.c) -add_library (EmptyStructsLib SHARED EmptyStructs.cpp) +add_library (StructABILib ${TEST_LIB_TYPE} StructABI.c) +add_library (EmptyStructsLib ${TEST_LIB_TYPE} EmptyStructs.cpp) # add the install targets install (TARGETS StructABILib EmptyStructsLib DESTINATION bin) diff --git a/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt b/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt index cc07026a86f45e..16760e64f5fc11 100644 --- a/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt +++ b/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt @@ -3,5 +3,5 @@ project(AliasingRetBufNative) # This test always needs to be optimized to hit the problem. set(CMAKE_BUILD_TYPE Release) -add_library(AliasingRetBufNative SHARED aliasing_retbuf_native.cpp) +add_library(AliasingRetBufNative ${TEST_LIB_TYPE} aliasing_retbuf_native.cpp) diff --git a/src/tests/JIT/Directed/arglist/CMakeLists.txt b/src/tests/JIT/Directed/arglist/CMakeLists.txt index eaa75ccf09ab37..6ddf5453d2ab78 100644 --- a/src/tests/JIT/Directed/arglist/CMakeLists.txt +++ b/src/tests/JIT/Directed/arglist/CMakeLists.txt @@ -8,7 +8,7 @@ else() endif() # add the executable -add_library (varargnative SHARED varargnative.c) +add_library (varargnative ${TEST_LIB_TYPE} varargnative.c) # add the install targets install (TARGETS varargnative DESTINATION bin) diff --git a/src/tests/JIT/Directed/callconv/CMakeLists.txt b/src/tests/JIT/Directed/callconv/CMakeLists.txt index 97d95ebef8fb20..138fdb4c2c3152 100644 --- a/src/tests/JIT/Directed/callconv/CMakeLists.txt +++ b/src/tests/JIT/Directed/callconv/CMakeLists.txt @@ -4,16 +4,16 @@ set(SOURCES InstanceCallConvTest.cpp ) -add_library (ThisCallNative SHARED ${SOURCES}) +add_library (ThisCallNative ${TEST_LIB_TYPE} ${SOURCES}) target_compile_definitions(ThisCallNative PRIVATE INSTANCE_CALLCONV=__thiscall) -add_library (StdCallMemberFunctionNative SHARED ${SOURCES}) +add_library (StdCallMemberFunctionNative ${TEST_LIB_TYPE} ${SOURCES}) target_compile_definitions(StdCallMemberFunctionNative PRIVATE INSTANCE_CALLCONV=__stdcall) -add_library (CdeclMemberFunctionNative SHARED ${SOURCES}) +add_library (CdeclMemberFunctionNative ${TEST_LIB_TYPE} ${SOURCES}) target_compile_definitions(CdeclMemberFunctionNative PRIVATE INSTANCE_CALLCONV=__cdecl) -add_library (PlatformDefaultMemberFunctionNative SHARED ${SOURCES}) +add_library (PlatformDefaultMemberFunctionNative ${TEST_LIB_TYPE} ${SOURCES}) target_compile_definitions(PlatformDefaultMemberFunctionNative PRIVATE INSTANCE_CALLCONV=STDMETHODCALLTYPE) install (TARGETS ThisCallNative DESTINATION bin) diff --git a/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt b/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt index 3b412d93042273..3019dea7198ebb 100644 --- a/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt +++ b/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt @@ -1,4 +1,4 @@ project(object_pin_mirror) -add_library(mirror SHARED mirror.cpp) +add_library(mirror ${TEST_LIB_TYPE} mirror.cpp) SET_TARGET_PROPERTIES(mirror PROPERTIES COMPILE_FLAGS "-c") diff --git a/src/tests/JIT/Directed/pinvoke/CMakeLists.txt b/src/tests/JIT/Directed/pinvoke/CMakeLists.txt index 48b0bfa1c4cf69..f046b845164bf6 100644 --- a/src/tests/JIT/Directed/pinvoke/CMakeLists.txt +++ b/src/tests/JIT/Directed/pinvoke/CMakeLists.txt @@ -1,4 +1,4 @@ project(PInvokeExampleNative) -add_library(PInvokeExampleNative SHARED pinvokeexamplenative.cpp) +add_library(PInvokeExampleNative ${TEST_LIB_TYPE} pinvokeexamplenative.cpp) SET_TARGET_PROPERTIES(PInvokeExampleNative PROPERTIES COMPILE_FLAGS "-c") diff --git a/src/tests/JIT/Directed/tls/CMakeLists.txt b/src/tests/JIT/Directed/tls/CMakeLists.txt index 3eaf0d3b22a0c0..a4836ee3dbc6b0 100644 --- a/src/tests/JIT/Directed/tls/CMakeLists.txt +++ b/src/tests/JIT/Directed/tls/CMakeLists.txt @@ -3,6 +3,6 @@ include_directories(${INC_PLATFORM_DIR}) -add_library(usetls SHARED testtls.cpp) +add_library(usetls ${TEST_LIB_TYPE} testtls.cpp) install (TARGETS usetls DESTINATION bin) diff --git a/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt b/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt index 13049b20763450..8ffe5ecf75cea9 100644 --- a/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt +++ b/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt @@ -4,7 +4,7 @@ set(SOURCES GCPollNative.cpp ) -add_library (GCPollNative SHARED ${SOURCES}) +add_library (GCPollNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS GCPollNative DESTINATION bin) diff --git a/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt b/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt index b36677f461415c..b3c1a4711756ca 100644 --- a/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt +++ b/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt @@ -1,4 +1,4 @@ project(jitstructtests) set(SOURCES structinregs.cpp structinregs.def) -add_library(jitstructtests_lib SHARED ${SOURCES}) +add_library(jitstructtests_lib ${TEST_LIB_TYPE} ${SOURCES}) diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt b/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt index 2dd7b9df74344f..b42ec99c906e9b 100644 --- a/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt +++ b/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt @@ -3,5 +3,5 @@ include_directories(${INC_PLATFORM_DIR}) # This test always needs to be optimized to hit the problem. set(CMAKE_BUILD_TYPE Release) -add_library(Runtime101046Native SHARED Runtime_101046.cpp) +add_library(Runtime101046Native ${TEST_LIB_TYPE} Runtime_101046.cpp) target_link_libraries(Runtime101046Native PRIVATE platformdefines) diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt b/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt index 2cdee0de43a7a6..78b3c75878cb03 100644 --- a/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt +++ b/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt @@ -1,3 +1,3 @@ include_directories(${INC_PLATFORM_DIR}) -add_library(CrossplatVirtualAlloc SHARED CrossplatVirtualAlloc.cpp) +add_library(CrossplatVirtualAlloc ${TEST_LIB_TYPE} CrossplatVirtualAlloc.cpp) target_link_libraries(CrossplatVirtualAlloc PRIVATE platformdefines) diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt index 9226518586e3d5..382fdd280cc5f1 100644 --- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt +++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt @@ -1,5 +1,5 @@ project(b108129_test2) include_directories(${INC_PLATFORM_DIR}) -add_library(test2 SHARED test2.cpp) +add_library(test2 ${TEST_LIB_TYPE} test2.cpp) SET_TARGET_PROPERTIES(test2 PROPERTIES COMPILE_FLAGS "-c") diff --git a/src/tests/JIT/SIMD/CMakeLists.txt b/src/tests/JIT/SIMD/CMakeLists.txt index a5127be36f4658..f88bd15e5860e9 100644 --- a/src/tests/JIT/SIMD/CMakeLists.txt +++ b/src/tests/JIT/SIMD/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES Vector3TestNative.cpp ) # add the executable -add_library (Vector3TestNative SHARED ${SOURCES}) +add_library (Vector3TestNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS Vector3TestNative DESTINATION bin) diff --git a/src/tests/JIT/interpreter/CMakeLists.txt b/src/tests/JIT/interpreter/CMakeLists.txt index d13e359372bf41..22a5171fc28571 100644 --- a/src/tests/JIT/interpreter/CMakeLists.txt +++ b/src/tests/JIT/interpreter/CMakeLists.txt @@ -5,11 +5,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES pinvoke.cpp) # add the executable -if (STATIC_LIBS_ONLY) - add_library (pinvoke STATIC ${SOURCES}) -else () - add_library (pinvoke SHARED ${SOURCES}) -endif () +add_library (pinvoke ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS pinvoke DESTINATION bin) diff --git a/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt b/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt index 57dda096197d67..e378db09ccf58f 100644 --- a/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt +++ b/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt @@ -1,14 +1,14 @@ project(hfa_interop) -add_library(hfa_simple_f32_native_cpp SHARED hfa_native.cpp) +add_library(hfa_simple_f32_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_simple_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DSIMPLE_HFA -DFLOAT32") -add_library(hfa_simple_f64_native_cpp SHARED hfa_native.cpp) +add_library(hfa_simple_f64_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_simple_f64_native_cpp PROPERTIES COMPILE_FLAGS "-c -DSIMPLE_HFA -DFLOAT64") -add_library(hfa_nested_f32_native_cpp SHARED hfa_native.cpp) +add_library(hfa_nested_f32_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_nested_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DNESTED_HFA -DFLOAT32") -add_library(hfa_nested_f64_native_cpp SHARED hfa_native.cpp) +add_library(hfa_nested_f64_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_nested_f64_native_cpp PROPERTIES COMPILE_FLAGS "-c -DNESTED_HFA -DFLOAT64") diff --git a/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt b/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt index ca6502d07cc97a..4ad6622ec2d56c 100644 --- a/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt +++ b/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt @@ -1,17 +1,17 @@ project(mcc_native) -add_library(native_i0c SHARED native_i0c.cpp) -add_library(native_i1c SHARED native_i1c.cpp) -add_library(native_i3c SHARED native_i3c.cpp) -add_library(native_i5c SHARED native_i5c.cpp) -add_library(native_i6c SHARED native_i6c.cpp) -add_library(native_i7c SHARED native_i7c.cpp) -add_library(native_i8c SHARED native_i8c.cpp) +add_library(native_i0c ${TEST_LIB_TYPE} native_i0c.cpp) +add_library(native_i1c ${TEST_LIB_TYPE} native_i1c.cpp) +add_library(native_i3c ${TEST_LIB_TYPE} native_i3c.cpp) +add_library(native_i5c ${TEST_LIB_TYPE} native_i5c.cpp) +add_library(native_i6c ${TEST_LIB_TYPE} native_i6c.cpp) +add_library(native_i7c ${TEST_LIB_TYPE} native_i7c.cpp) +add_library(native_i8c ${TEST_LIB_TYPE} native_i8c.cpp) -add_library(native_i0s SHARED native_i0s.cpp) -add_library(native_i1s SHARED native_i1s.cpp) -add_library(native_i3s SHARED native_i3s.cpp) -add_library(native_i5s SHARED native_i5s.cpp) -add_library(native_i6s SHARED native_i6s.cpp) -add_library(native_i7s SHARED native_i7s.cpp) -add_library(native_i8s SHARED native_i8s.cpp) +add_library(native_i0s ${TEST_LIB_TYPE} native_i0s.cpp) +add_library(native_i1s ${TEST_LIB_TYPE} native_i1s.cpp) +add_library(native_i3s ${TEST_LIB_TYPE} native_i3s.cpp) +add_library(native_i5s ${TEST_LIB_TYPE} native_i5s.cpp) +add_library(native_i6s ${TEST_LIB_TYPE} native_i6s.cpp) +add_library(native_i7s ${TEST_LIB_TYPE} native_i7s.cpp) +add_library(native_i8s ${TEST_LIB_TYPE} native_i8s.cpp) diff --git a/src/tests/Loader/NativeLibs/CMakeLists.txt b/src/tests/Loader/NativeLibs/CMakeLists.txt index 905e25c68023ed..88acf3d9218a08 100644 --- a/src/tests/Loader/NativeLibs/CMakeLists.txt +++ b/src/tests/Loader/NativeLibs/CMakeLists.txt @@ -3,6 +3,6 @@ project(FromNativePaths_lib) set(CMAKE_SHARED_LIBRARY_PREFIX "") set(SOURCES FromNativePaths_lib.cpp) -add_library(FromNativePaths_lib SHARED ${SOURCES}) +add_library(FromNativePaths_lib ${TEST_LIB_TYPE} ${SOURCES}) install(TARGETS FromNativePaths_lib DESTINATION Loader/NativeLibs) diff --git a/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt b/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt index 03d44205e8f714..f12589b057de06 100644 --- a/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt +++ b/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt @@ -2,7 +2,7 @@ if (CLR_CMAKE_TARGET_APPLE) include_directories(${INC_PLATFORM_DIR}) - add_library(nativetest102887 SHARED nativetest102887.cpp) + add_library(nativetest102887 ${TEST_LIB_TYPE} nativetest102887.cpp) # add the install targets install (TARGETS nativetest102887 DESTINATION bin) diff --git a/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt b/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt index ee32f08007f630..5cc46844c4c2ff 100644 --- a/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt +++ b/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt @@ -9,7 +9,7 @@ else() endif() # add the executable -add_library (Test111242Lib SHARED Test111242.c) +add_library (Test111242Lib ${TEST_LIB_TYPE} Test111242.c) # add the install targets install (TARGETS Test111242Lib DESTINATION bin) diff --git a/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt b/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt index e50bf224c6fed4..af39031378d90e 100644 --- a/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt +++ b/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES nativetest117393.cpp) # add the shared library -add_library (nativetest117393 SHARED ${SOURCES}) +add_library (nativetest117393 ${TEST_LIB_TYPE} ${SOURCES}) target_link_libraries(nativetest117393 PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/baseservices/CET/CMakeLists.txt b/src/tests/baseservices/CET/CMakeLists.txt index 226738c71f862f..fba597da94d59f 100644 --- a/src/tests/baseservices/CET/CMakeLists.txt +++ b/src/tests/baseservices/CET/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(cet_check SHARED CETCheck.cpp) +add_library(cet_check ${TEST_LIB_TYPE} CETCheck.cpp) # add the install targets install (TARGETS cet_check DESTINATION bin) diff --git a/src/tests/baseservices/callconvs/CMakeLists.txt b/src/tests/baseservices/callconvs/CMakeLists.txt index 7a557e3039b487..cf67004ac3308a 100644 --- a/src/tests/baseservices/callconvs/CMakeLists.txt +++ b/src/tests/baseservices/callconvs/CMakeLists.txt @@ -1,7 +1,7 @@ project (NativeFunctions) include_directories(${INC_PLATFORM_DIR}) -add_library (NativeFunctions SHARED NativeFunctions.cpp) +add_library (NativeFunctions ${TEST_LIB_TYPE} NativeFunctions.cpp) # add the install targets install (TARGETS NativeFunctions DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt index c3f82e3261a881..fc76378ebdb7a1 100644 --- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (ForeignUnhandledNative SHARED ${SOURCES}) +add_library (ForeignUnhandledNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS ForeignUnhandledNative DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt index 82d0216e586660..3d00721aebdc17 100644 --- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (PInvokeUnhandledNative SHARED ${SOURCES}) +add_library (PInvokeUnhandledNative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS PInvokeUnhandledNative DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt b/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt index a477a57c1cdbdc..e7677cd0822e3a 100644 --- a/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt @@ -1,4 +1,4 @@ include_directories(${INC_PLATFORM_DIR}) -add_library(ExceptionInteropNative SHARED ExceptionInteropNative.cpp) +add_library(ExceptionInteropNative ${TEST_LIB_TYPE} ExceptionInteropNative.cpp) target_link_libraries(ExceptionInteropNative PRIVATE platformdefines) \ No newline at end of file diff --git a/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt b/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt index 51ca76c8f9135c..c8c34bc68871e4 100644 --- a/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt @@ -3,7 +3,7 @@ project (fpcw) include_directories(${INC_PLATFORM_DIR}) # add the executable -add_library (fpcw SHARED fpcw.cpp) +add_library (fpcw ${TEST_LIB_TYPE} fpcw.cpp) # add the install targets install (TARGETS fpcw DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt index 059c9d6444d402..2e199af8147da9 100644 --- a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt @@ -3,7 +3,7 @@ project (Unmanaged) include_directories(${INC_PLATFORM_DIR}) # add the executable -add_library (Unmanaged SHARED Unmanaged.cpp) +add_library (Unmanaged ${TEST_LIB_TYPE} Unmanaged.cpp) # add the install targets install (TARGETS Unmanaged DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt b/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt index b08c1aa651ed67..5ef7b4c736e912 100644 --- a/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (unhandlednative SHARED ${SOURCES}) +add_library (unhandlednative ${TEST_LIB_TYPE} ${SOURCES}) # add the install targets install (TARGETS unhandlednative DESTINATION bin) diff --git a/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt b/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt index a631acce2c89d0..bef510a6898e39 100644 --- a/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt +++ b/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt @@ -1,7 +1,7 @@ project (ComWrappersNative) include_directories(${INC_PLATFORM_DIR}) -add_library (ComWrappersNative SHARED ComWrappersNative.cpp) +add_library (ComWrappersNative ${TEST_LIB_TYPE} ComWrappersNative.cpp) # add the install targets install (TARGETS ComWrappersNative DESTINATION bin) diff --git a/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt b/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt index 7aabb442144009..d312b26180e6c2 100644 --- a/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt +++ b/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt @@ -7,7 +7,7 @@ if(CLR_CMAKE_HOST_WIN32) ) endif(CLR_CMAKE_HOST_WIN32) -add_library (PInvokeNative SHARED PInvokeNative.cpp) +add_library (PInvokeNative ${TEST_LIB_TYPE} PInvokeNative.cpp) target_link_libraries(PInvokeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/profiler/native/CMakeLists.txt b/src/tests/profiler/native/CMakeLists.txt index a0590d61d1127e..94658271b9056f 100644 --- a/src/tests/profiler/native/CMakeLists.txt +++ b/src/tests/profiler/native/CMakeLists.txt @@ -49,7 +49,7 @@ if(NOT WIN32) endif(NOT WIN32) # add the executable -add_library(Profiler SHARED ${SOURCES}) +add_library(Profiler ${TEST_LIB_TYPE} ${SOURCES}) if(WIN32) set(DEPENDENCIES Advapi32.lib oleaut32.lib Ole32.lib) diff --git a/src/tests/readytorun/tests/CMakeLists.txt b/src/tests/readytorun/tests/CMakeLists.txt index 19c217fd854997..43586789469b2e 100644 --- a/src/tests/readytorun/tests/CMakeLists.txt +++ b/src/tests/readytorun/tests/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES native.cpp) -add_library(nativelibrary SHARED ${SOURCES}) +add_library(nativelibrary ${TEST_LIB_TYPE} ${SOURCES}) install(TARGETS nativelibrary DESTINATION bin) From 4f78ce3e9eee00779c3860680a11ba0a88a9f35b Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 16:20:08 +0200 Subject: [PATCH 05/27] Mono specific parts of liveBuilds --- eng/liveBuilds.targets | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 3d5edd9ea06160..d64793dd64aaab 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -217,25 +217,28 @@ IsNative="true" /> + - - - - Date: Fri, 3 Oct 2025 16:45:43 +0200 Subject: [PATCH 06/27] build browser libs for coreCLR flavor --- src/native/libs/build-native.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/native/libs/build-native.proj b/src/native/libs/build-native.proj index a343ca0269ea9b..36781d390c2b2c 100644 --- a/src/native/libs/build-native.proj +++ b/src/native/libs/build-native.proj @@ -20,6 +20,7 @@ <_CMakeArgs Condition="'$(WasmEnableThreads)' == 'true'">$(_CMakeArgs) -cmakeargs "-DCMAKE_USE_PTHREADS=1" <_CMakeArgs Condition="'$(_IcuDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_ICU_DIR=$(_IcuDir)" <_CMakeArgs Condition="'$(_TzdDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_TZD_DIR=$(_TzdDir)" + <_CMakeArgs Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$(_CMakeArgs) -cmakeargs "-DBUILD_LIBS_NATIVE_BROWSER=1" <_BuildNativeArgs>$(_BuildNativeArgs)$(_CMakeArgs) From 81b17e6772fc7fd2b78b8d7abd0407bc48d25474 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 16:46:18 +0200 Subject: [PATCH 07/27] build clr+libs on CI --- eng/Subsets.props | 7 ++++--- eng/pipelines/runtime.yml | 2 +- src/coreclr/tools/aot/ILCompiler/ILCompiler.props | 1 + src/coreclr/tools/aot/crossgen2/crossgen2.props | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 73a41947cb6967..4c5c37993cf74a 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -53,7 +53,7 @@ <_SdkToolsSupportedOS Condition="'$(TargetsMobile)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">true - <_SdkToolsSupportedArch Condition="'$(TargetArchitecture)' != 'armel'">true + <_SdkToolsSupportedArch Condition="'$(TargetArchitecture)' != 'armel' and '$(TargetsWasm)' != 'true'">true true <_UseNativeAotForComponentsCrossOS Condition="'$(CrossBuild)' == 'true' and '$(_hostArchitecture)' == '$(_targetArchitecture)' and '$(_hostOS)' != 'windows'">true @@ -108,7 +108,8 @@ clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools+host.native clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools - clr.native+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.crossarchtools+host.native + + mono.emsdk+clr.native+clr.corelib+clr.tools+clr.packages+clr.crossarchtools clr.iltools+clr.packages @@ -363,7 +364,7 @@ The cross tools are used as part of the build process with the downloaded build tools, so we need to build them for the host architecture and build them as unsanitized binaries. --> - <_BuildAnyCrossArch Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '') and '$(TargetArchitecture)' != 'wasm'">true + <_BuildAnyCrossArch Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != '') and '$(TargetsWasm)' != 'true'">true <_BuildCrossComponents Condition="$(_subset.Contains('+clr.crossarchtools+'))">true <_BuildCrossComponents Condition="'$(ClrRuntimeBuildSubsets)' != '' and ('$(PrimaryRuntimeFlavor)' == 'CoreCLR' or '$(TargetsMobile)' == 'true')">true <_CrossBitwidthBuild Condition="'$(BuildArchitecture)' == 'x64' and ('$(TargetArchitecture)' == 'x86' or '$(TargetArchitecture)' == 'arm')">true diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 64db126cf99cde..51b9b37cf13126 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -111,7 +111,7 @@ extends: - browser_wasm_win jobParameters: nameSuffix: AllSubsets_CoreCLR - buildArgs: -s clr.runtime+libs -rc Release -c Release -lc $(_BuildConfig) + buildArgs: -s clr+libs -rc Release -c Release -lc $(_BuildConfig) timeoutInMinutes: 120 condition: >- or( diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props index 5ae9f528f506f9..569fb48bc9e151 100644 --- a/src/coreclr/tools/aot/ILCompiler/ILCompiler.props +++ b/src/coreclr/tools/aot/ILCompiler/ILCompiler.props @@ -67,6 +67,7 @@ CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" Link="%(FileName)%(Extension)" + Condition="'$(TargetsWasm)' != 'true'" /> Date: Fri, 3 Oct 2025 17:13:20 +0200 Subject: [PATCH 08/27] build runtime test Interpreter.csproj on CI --- eng/pipelines/runtime.yml | 4 ++++ src/tests/build.sh | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 51b9b37cf13126..2a7b559c1395a7 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -113,6 +113,10 @@ extends: nameSuffix: AllSubsets_CoreCLR buildArgs: -s clr+libs -rc Release -c Release -lc $(_BuildConfig) timeoutInMinutes: 120 + postBuildSteps: + - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml + parameters: + testBuildArgs: wasm browser release test JIT\interpreter\Interpreter.csproj condition: >- or( eq(variables['wasmDarcDependenciesChanged'], true), diff --git a/src/tests/build.sh b/src/tests/build.sh index e7be4cf88b778e..627339c16ea49b 100755 --- a/src/tests/build.sh +++ b/src/tests/build.sh @@ -60,7 +60,7 @@ build_Tests() export MSBUILDDEBUGPATH if [[ "$__SkipNative" != 1 && "$__BuildTestWrappersOnly" != 1 && "$__GenerateLayoutOnly" != 1 && "$__CopyNativeTestBinaries" != 1 && \ - "$__TargetOS" != "browser" && "$__TargetOS" != "android" && "$__TargetOS" != "ios" && "$__TargetOS" != "iossimulator" && "$__TargetOS" != "tvos" && "$__TargetOS" != "tvossimulator" ]]; then + "$__TargetOS" != "android" && "$__TargetOS" != "ios" && "$__TargetOS" != "iossimulator" && "$__TargetOS" != "tvos" && "$__TargetOS" != "tvossimulator" ]]; then build_native "$__TargetOS" "$__TargetArch" "$__TestDir" "$__NativeTestIntermediatesDir" "install" "$__CMakeArgs" "CoreCLR test component" if [[ "$?" -ne 0 ]]; then @@ -238,6 +238,20 @@ handle_arguments_local() { __RebuildTests=1 ;; + wasm|-wasm) + __TargetArch=wasm + ;; + + wasi|-wasi) + __TargetOS=wasi + __TargetArch=wasm + ;; + + browser|-browser) + __TargetOS=browser + __TargetArch=wasm + ;; + test*|-test*) local arg="$1" local parts=(${arg//:/ }) From 90eb1c6814ced44fe4754d80c986b14286105358 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 18:20:11 +0200 Subject: [PATCH 09/27] fix --- eng/pipelines/runtime.yml | 7 ++++++- src/tests/build.cmd | 1 + src/tests/build.sh | 14 -------------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 2a7b559c1395a7..2ee4ff1de3e4d3 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -116,7 +116,12 @@ extends: postBuildSteps: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml parameters: - testBuildArgs: wasm browser release test JIT\interpreter\Interpreter.csproj + buildConfig: release + priorityArg: '' + runtimeVariantArg: '' + librariesConfigurationArg: /p:LibrariesConfiguration=Release + runtimeFlavorArgs: /p:RuntimeFlavor=CoreCLR + testBuildArgs: test src/tests/JIT/interpreter/Interpreter.csproj condition: >- or( eq(variables['wasmDarcDependenciesChanged'], true), diff --git a/src/tests/build.cmd b/src/tests/build.cmd index 776013dfa588ec..73691be70ac458 100644 --- a/src/tests/build.cmd +++ b/src/tests/build.cmd @@ -74,6 +74,7 @@ if /i "%1" == "x86" (set __BuildArch=x86&set processedArgs= if /i "%1" == "arm64" (set __BuildArch=arm64&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "wasm" (set __BuildArch=wasm&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) +if /i "%1" == "os" (set __TargetOS=%2&set processedArgs=!processedArgs! %1&shift&shift&goto Arg_Loop) if /i "%1" == "browser" (set __TargetOS=browser&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) if /i "%1" == "wasi" (set __TargetOS=wasi&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop) diff --git a/src/tests/build.sh b/src/tests/build.sh index 627339c16ea49b..1a556196b24902 100755 --- a/src/tests/build.sh +++ b/src/tests/build.sh @@ -238,20 +238,6 @@ handle_arguments_local() { __RebuildTests=1 ;; - wasm|-wasm) - __TargetArch=wasm - ;; - - wasi|-wasi) - __TargetOS=wasi - __TargetArch=wasm - ;; - - browser|-browser) - __TargetOS=browser - __TargetArch=wasm - ;; - test*|-test*) local arg="$1" local parts=(${arg//:/ }) From af945291646378c0f1c9c0ce2c3ba6390905bb59 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 21:31:59 +0200 Subject: [PATCH 10/27] fix --- eng/pipelines/runtime.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 2ee4ff1de3e4d3..0bfcf156e1d53b 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -116,9 +116,6 @@ extends: postBuildSteps: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml parameters: - buildConfig: release - priorityArg: '' - runtimeVariantArg: '' librariesConfigurationArg: /p:LibrariesConfiguration=Release runtimeFlavorArgs: /p:RuntimeFlavor=CoreCLR testBuildArgs: test src/tests/JIT/interpreter/Interpreter.csproj From ba43b5c1ce1725a627201f711a69abe0610d6943 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Fri, 3 Oct 2025 22:33:57 +0200 Subject: [PATCH 11/27] default empty values, fix --- eng/pipelines/common/global-build-job.yml | 8 ++++++++ eng/pipelines/runtime.yml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index d76f7075d72f8a..ccbe5032fb9bc3 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -136,6 +136,14 @@ jobs: # Set no native sanitizers by default - name: _nativeSanitizersArg value: '' + - name: priorityArg + value: '' + - name: runtimeFlavorArgs + value: '' + - name: runtimeVariantArg + value: '' + - name: librariesConfigurationArg + value: '' - ${{ each variableTemplate in parameters.extraVariablesTemplates }}: - template: ${{ variableTemplate.template }} diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 0bfcf156e1d53b..e01398b199a888 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -118,7 +118,7 @@ extends: parameters: librariesConfigurationArg: /p:LibrariesConfiguration=Release runtimeFlavorArgs: /p:RuntimeFlavor=CoreCLR - testBuildArgs: test src/tests/JIT/interpreter/Interpreter.csproj + testBuildArgs: test JIT/interpreter/Interpreter.csproj condition: >- or( eq(variables['wasmDarcDependenciesChanged'], true), From 3e4120a7f10f9c4194ed950f98b41e28346486d6 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Sat, 4 Oct 2025 10:07:20 +0200 Subject: [PATCH 12/27] fix --- eng/pipelines/runtime.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index e01398b199a888..cd0d85fcf7ab78 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -111,14 +111,12 @@ extends: - browser_wasm_win jobParameters: nameSuffix: AllSubsets_CoreCLR - buildArgs: -s clr+libs -rc Release -c Release -lc $(_BuildConfig) + buildArgs: -s clr+libs -rc Release -c $(_BuildConfig) -lc $(_BuildConfig) timeoutInMinutes: 120 postBuildSteps: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml parameters: - librariesConfigurationArg: /p:LibrariesConfiguration=Release - runtimeFlavorArgs: /p:RuntimeFlavor=CoreCLR - testBuildArgs: test JIT/interpreter/Interpreter.csproj + testBuildArgs: test JIT/interpreter/Interpreter.csproj /p:LibrariesConfiguration=$(_BuildConfig) condition: >- or( eq(variables['wasmDarcDependenciesChanged'], true), From 53c32157b65a75d61a1d0c17d2289b78499bf575 Mon Sep 17 00:00:00 2001 From: Pavel Savara Date: Sat, 4 Oct 2025 11:10:39 +0200 Subject: [PATCH 13/27] fix --- eng/pipelines/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index cd0d85fcf7ab78..9384071aec7c4c 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -111,7 +111,7 @@ extends: - browser_wasm_win jobParameters: nameSuffix: AllSubsets_CoreCLR - buildArgs: -s clr+libs -rc Release -c $(_BuildConfig) -lc $(_BuildConfig) + buildArgs: -s clr+libs -rc $(_BuildConfig) -c $(_BuildConfig) -lc $(_BuildConfig) timeoutInMinutes: 120 postBuildSteps: - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests.yml From b2030ad546c8ae36ca8b7195075b682c1383a808 Mon Sep 17 00:00:00 2001 From: Pavel Savara Date: Sat, 4 Oct 2025 12:13:15 +0200 Subject: [PATCH 14/27] fix runtime.win-x64.microsoft.netcore.runtime.mono.llvm.sdk.debug --- src/mono/llvm/llvm-init.proj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mono/llvm/llvm-init.proj b/src/mono/llvm/llvm-init.proj index cce72ce0a59f94..a7b32d10506f24 100644 --- a/src/mono/llvm/llvm-init.proj +++ b/src/mono/llvm/llvm-init.proj @@ -13,7 +13,7 @@ $(runtimelinuxmuslx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion) $(runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion) $(runtimeosxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion) - .Debug + .Debug @@ -74,9 +74,9 @@ Version="$(MonoLLVMToolsVersion)" PackageArch="$(BuildArchitecture)"/> - - <_PackageReferenceDeduplicated Remove="runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" /> - <_PackageReferenceDeduplicated Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" + + <_PackageReferenceDeduplicated Remove="runtime.$(MonoLLVMHostOS)-wasm.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)" /> + <_PackageReferenceDeduplicated Include="runtime.$(MonoLLVMHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Mono.LLVM.Sdk$(MonoLLVMSDKDebugSuffix)" Version="$(MonoLLVMSDKVersion)" PackageArch="$(BuildArchitecture)"/> From 61ebeb26e01e911f2c54d0b566421aaa18e9d667 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Sat, 4 Oct 2025 13:33:22 +0200 Subject: [PATCH 15/27] liveBuilds --- eng/liveBuilds.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index d64793dd64aaab..29f99870456374 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -215,7 +215,8 @@ $(LibrariesNativeArtifactsPath)*.dex; $(LibrariesNativeArtifactsPath)*.jar;" IsNative="true" /> - + Date: Tue, 7 Oct 2025 21:09:56 +0200 Subject: [PATCH 23/27] Update src/tests/CMakeLists.txt Co-authored-by: Aaron Robinson --- src/tests/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index f4b6ca7ca60620..eaa20860a45080 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -71,10 +71,6 @@ else() add_compile_options( -fwasm-exceptions -msimd128) - add_link_options( - -fwasm-exceptions - -msimd128 - ) # opt in into tests that make sense for WASM add_subdirectory(JIT/interpreter) From 683062a259c96d2bed2e6512eb440f152703b8dd Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Tue, 7 Oct 2025 21:13:12 +0200 Subject: [PATCH 24/27] feedback --- src/coreclr/CMakeLists.txt | 4 ---- src/coreclr/hosts/corerun/CMakeLists.txt | 2 -- src/coreclr/hosts/corewasmrun/CMakeLists.txt | 2 -- src/coreclr/pal/CMakeLists.txt | 4 ---- src/mono/mono/mini/CMakeLists.txt | 1 - src/native/corehost/browserhost/CMakeLists.txt | 2 -- src/native/libs/build-native.proj | 2 +- 7 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index b465aa0a54321e..77f54eb6211986 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -39,10 +39,6 @@ if (CLR_CMAKE_TARGET_ARCH_WASM) add_compile_options( -fwasm-exceptions -msimd128) - add_link_options( - -fwasm-exceptions - -msimd128 - ) endif() #---------------------------------------------------- diff --git a/src/coreclr/hosts/corerun/CMakeLists.txt b/src/coreclr/hosts/corerun/CMakeLists.txt index 8aa49f56f0fc4d..6738b20842aba6 100644 --- a/src/coreclr/hosts/corerun/CMakeLists.txt +++ b/src/coreclr/hosts/corerun/CMakeLists.txt @@ -68,8 +68,6 @@ else(CLR_CMAKE_HOST_WIN32) LINK_FLAGS "--pre-js ${JS_CORE_RUN_PRE} --js-library ${JS_SYSTEM_NATIVE_BROWSER} --js-library ${JS_SYSTEM_BROWSER_UTILS}" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") target_link_options(corerun PRIVATE - -fwasm-exceptions - -msimd128 -sEXIT_RUNTIME=1 -sINITIAL_MEMORY=134217728 -sENVIRONMENT=node,shell diff --git a/src/coreclr/hosts/corewasmrun/CMakeLists.txt b/src/coreclr/hosts/corewasmrun/CMakeLists.txt index 5d96f9cdf49754..6697310031257c 100644 --- a/src/coreclr/hosts/corewasmrun/CMakeLists.txt +++ b/src/coreclr/hosts/corewasmrun/CMakeLists.txt @@ -32,8 +32,6 @@ set_target_properties(corewasmrun PROPERTIES LINK_FLAGS "--pre-js ${JS_CORE_WASM_RUN_PRE} --js-library ${JS_SYSTEM_NATIVE_BROWSER} --js-library ${JS_SYSTEM_BROWSER_UTILS}" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") target_link_options(corewasmrun PRIVATE - -fwasm-exceptions - -msimd128 -sEXIT_RUNTIME=1 -sINITIAL_MEMORY=134217728 -sSTACK_SIZE=5MB diff --git a/src/coreclr/pal/CMakeLists.txt b/src/coreclr/pal/CMakeLists.txt index b086e20850b9e2..52ceb0c2e1b3ff 100644 --- a/src/coreclr/pal/CMakeLists.txt +++ b/src/coreclr/pal/CMakeLists.txt @@ -13,10 +13,6 @@ else() -fwasm-exceptions -msimd128 ) - add_link_options( - -fwasm-exceptions - -msimd128 - ) endif() add_subdirectory(src) diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt index 23b8d15bf708f1..a4aab97f5685c6 100644 --- a/src/mono/mono/mini/CMakeLists.txt +++ b/src/mono/mono/mini/CMakeLists.txt @@ -477,7 +477,6 @@ if(HOST_BROWSER) add_library(mono-wasm-eh-wasm STATIC llvm-runtime.cpp) target_link_libraries (mono-wasm-eh-wasm PRIVATE monoapi eglib_api) set_target_properties(mono-wasm-eh-wasm PROPERTIES COMPILE_FLAGS "-fwasm-exceptions") - set_target_properties(mono-wasm-eh-wasm PROPERTIES LINK_FLAGS "-fwasm-exceptions") install(TARGETS mono-wasm-eh-wasm LIBRARY) endif() diff --git a/src/native/corehost/browserhost/CMakeLists.txt b/src/native/corehost/browserhost/CMakeLists.txt index a56a15655714c7..d24bdaa836d3b2 100644 --- a/src/native/corehost/browserhost/CMakeLists.txt +++ b/src/native/corehost/browserhost/CMakeLists.txt @@ -92,8 +92,6 @@ target_link_options(browserhost PRIVATE -sEXPORTED_RUNTIME_METHODS=UTF8ToString,cwrap,ccall,HEAPU8,HEAPU32,HEAPU64,BROWSER_HOST -sEXPORTED_FUNCTIONS=_posix_memalign,_free,stackAlloc,stackRestore,stackSave,_BrowserHost_InitializeCoreCLR,_BrowserHost_ExecuteAssembly,___cpp_exception -sEXPORT_NAME=createDotnetRuntime - -fwasm-exceptions - -msimd128 -lnodefs.js -Wno-unused-command-line-argument -Wl,-error-limit=0) diff --git a/src/native/libs/build-native.proj b/src/native/libs/build-native.proj index 36781d390c2b2c..9384349f94466f 100644 --- a/src/native/libs/build-native.proj +++ b/src/native/libs/build-native.proj @@ -20,7 +20,7 @@ <_CMakeArgs Condition="'$(WasmEnableThreads)' == 'true'">$(_CMakeArgs) -cmakeargs "-DCMAKE_USE_PTHREADS=1" <_CMakeArgs Condition="'$(_IcuDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_ICU_DIR=$(_IcuDir)" <_CMakeArgs Condition="'$(_TzdDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_TZD_DIR=$(_TzdDir)" - <_CMakeArgs Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$(_CMakeArgs) -cmakeargs "-DBUILD_LIBS_NATIVE_BROWSER=1" + <_CMakeArgs Condition="'$(TargetsBrowser)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'" Include="-cmakeargs "-DBUILD_LIBS_NATIVE_BROWSER=1"" /> <_BuildNativeArgs>$(_BuildNativeArgs)$(_CMakeArgs) From a1186044b15397ea98256890a45e8402887e948f Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Tue, 7 Oct 2025 21:38:03 +0200 Subject: [PATCH 25/27] fix --- src/native/libs/build-native.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/native/libs/build-native.proj b/src/native/libs/build-native.proj index 9384349f94466f..97924a6e27ec7d 100644 --- a/src/native/libs/build-native.proj +++ b/src/native/libs/build-native.proj @@ -20,7 +20,7 @@ <_CMakeArgs Condition="'$(WasmEnableThreads)' == 'true'">$(_CMakeArgs) -cmakeargs "-DCMAKE_USE_PTHREADS=1" <_CMakeArgs Condition="'$(_IcuDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_ICU_DIR=$(_IcuDir)" <_CMakeArgs Condition="'$(_TzdDir)' != ''">$(_CMakeArgs) -cmakeargs "-DCMAKE_TZD_DIR=$(_TzdDir)" - <_CMakeArgs Condition="'$(TargetsBrowser)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'" Include="-cmakeargs "-DBUILD_LIBS_NATIVE_BROWSER=1"" /> + <_CMakeArgs Condition="'$(TargetsBrowser)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR'">$(_CMakeArgs) -cmakeargs "-DBUILD_LIBS_NATIVE_BROWSER=1" <_BuildNativeArgs>$(_BuildNativeArgs)$(_CMakeArgs) From 07de4f15798973c339566262bc32caad15b4d7f7 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Tue, 7 Oct 2025 21:42:02 +0200 Subject: [PATCH 26/27] feedback --- .../Common/hostpolicymock/CMakeLists.txt | 2 +- .../Exceptions/ForeignThread/CMakeLists.txt | 2 +- .../ArrayMarshalling/BoolArray/CMakeLists.txt | 2 +- .../ArrayMarshalling/SafeArray/CMakeLists.txt | 2 +- .../Interop/BestFitMapping/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../ComWrappers/WeakReference/CMakeLists.txt | 2 +- .../Interop/COM/Dynamic/Server/CMakeLists.txt | 2 +- .../Interop/COM/NativeServer/CMakeLists.txt | 2 +- .../DisabledRuntimeMarshalling/CMakeLists.txt | 2 +- .../DllImportPath/CMakeLists.txt | 8 +++--- .../ExactSpelling/CMakeLists.txt | 2 +- .../CMakeLists.txt | 4 +-- .../Interop/ExecInDefAppDom/CMakeLists.txt | 2 +- .../FuncPtrAsDelegateParam/CMakeLists.txt | 2 +- src/tests/Interop/GCBridge/CMakeLists.txt | 2 +- .../ConflictingNames/CMakeLists.txt | 2 +- .../Primitives/CMakeLists.txt | 2 +- .../CopyConstructorMarshaler/CMakeLists.txt | 2 +- .../IjwNativeCallingManagedDll/CMakeLists.txt | 2 +- .../Interop/IJW/IjwNativeDll/CMakeLists.txt | 2 +- .../Interop/IJW/NativeVarargs/CMakeLists.txt | 2 +- .../Interop/IJW/ijwhostmock/CMakeLists.txt | 2 +- src/tests/Interop/LayoutClass/CMakeLists.txt | 2 +- .../MarshalAPI/FunctionPointer/CMakeLists.txt | 2 +- .../mono-embedding-api-test/CMakeLists.txt | 2 +- .../NativeLibraryToLoad/CMakeLists.txt | 6 ++-- .../ObjectiveC/AutoReleaseTest/CMakeLists.txt | 2 +- .../ObjectiveCMarshalAPI/CMakeLists.txt | 2 +- .../LPArrayNative/CMakeLists.txt | 2 +- .../LPArrayNative/CMakeLists.txt | 2 +- .../PInvoke/ArrayWithOffset/CMakeLists.txt | 2 +- .../Interop/PInvoke/AsAny/CMakeLists.txt | 2 +- .../PInvoke/Attributes/LCID/CMakeLists.txt | 2 +- .../BestFitMapping/Char/CMakeLists.txt | 2 +- .../BestFitMapping/LPStr/CMakeLists.txt | 2 +- .../PInvoke/CriticalHandles/CMakeLists.txt | 2 +- .../PInvoke/CustomMarshalers/CMakeLists.txt | 2 +- .../Interop/PInvoke/DateTime/CMakeLists.txt | 2 +- .../Interop/PInvoke/Decimal/CMakeLists.txt | 2 +- .../Interop/PInvoke/Delegate/CMakeLists.txt | 2 +- .../Interop/PInvoke/Generics/CMakeLists.txt | 2 +- .../PInvoke/IEnumerator/CMakeLists.txt | 2 +- .../Interop/PInvoke/Int128/CMakeLists.txt | 2 +- .../Miscellaneous/HandleRef/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../PInvoke/Primitives/Int/CMakeLists.txt | 2 +- .../PInvoke/Primitives/Pointer/CMakeLists.txt | 2 +- .../Primitives/RuntimeHandles/CMakeLists.txt | 2 +- .../PInvoke/SafeHandles/CMakeLists.txt | 2 +- .../PInvoke/SetLastError/CMakeLists.txt | 2 +- .../PInvoke/PassingByOut/CMakeLists.txt | 2 +- .../PInvoke/PassingByRef/CMakeLists.txt | 2 +- .../PassingByOut/CMakeLists.txt | 2 +- .../PassingByRef/CMakeLists.txt | 2 +- .../Interop/PInvoke/Varargs/CMakeLists.txt | 2 +- .../Interop/PInvoke/Variant/CMakeLists.txt | 2 +- .../PInvoke/Vector2_3_4/CMakeLists.txt | 2 +- .../PrimitiveMarshalling/Bool/CMakeLists.txt | 2 +- .../EnumMarshalling/CMakeLists.txt | 2 +- .../UIntPtr/CMakeLists.txt | 2 +- src/tests/Interop/RefCharArray/CMakeLists.txt | 2 +- src/tests/Interop/SimpleStruct/CMakeLists.txt | 2 +- .../StringMarshalling/AnsiBSTR/CMakeLists.txt | 2 +- .../StringMarshalling/BSTR/CMakeLists.txt | 2 +- .../StringMarshalling/LPSTR/CMakeLists.txt | 2 +- .../StringMarshalling/LPTSTR/CMakeLists.txt | 2 +- .../StringMarshalling/UTF8/CMakeLists.txt | 2 +- .../VBByRefStr/CMakeLists.txt | 2 +- .../StructMarshalling/PInvoke/CMakeLists.txt | 2 +- .../MarshalExpStruct/CMakeLists.txt | 2 +- .../MarshalSeqStruct/CMakeLists.txt | 2 +- .../SuppressGCTransition/CMakeLists.txt | 2 +- .../Interop/UnmanagedCallConv/CMakeLists.txt | 2 +- .../UnmanagedCallersOnly/CMakeLists.txt | 2 +- src/tests/JIT/Directed/Convert/CMakeLists.txt | 2 +- .../JIT/Directed/PrimitiveABI/CMakeLists.txt | 2 +- .../JIT/Directed/StructABI/CMakeLists.txt | 4 +-- .../Directed/aliasing_retbuf/CMakeLists.txt | 2 +- src/tests/JIT/Directed/arglist/CMakeLists.txt | 2 +- .../JIT/Directed/callconv/CMakeLists.txt | 8 +++--- .../pinning/object-pin/CMakeLists.txt | 2 +- src/tests/JIT/Directed/pinvoke/CMakeLists.txt | 2 +- src/tests/JIT/Directed/tls/CMakeLists.txt | 2 +- .../JIT/Methodical/gc_poll/CMakeLists.txt | 2 +- .../structs/systemvbringup/CMakeLists.txt | 2 +- .../JitBlue/Runtime_101046/CMakeLists.txt | 2 +- .../JitBlue/Runtime_76194/CMakeLists.txt | 2 +- .../V1.2-M02/b108129/CMakeLists.txt | 2 +- src/tests/JIT/SIMD/CMakeLists.txt | 2 +- .../JIT/jit64/hfa/main/dll/CMakeLists.txt | 8 +++--- .../JIT/jit64/mcc/interop/CMakeLists.txt | 28 +++++++++---------- src/tests/Loader/NativeLibs/CMakeLists.txt | 2 +- .../coreclr/GitHub_102887/CMakeLists.txt | 2 +- .../coreclr/GitHub_111242/CMakeLists.txt | 2 +- .../coreclr/GitHub_117393/CMakeLists.txt | 2 +- src/tests/baseservices/CET/CMakeLists.txt | 2 +- .../baseservices/callconvs/CMakeLists.txt | 2 +- .../Foreign/CMakeLists.txt | 2 +- .../PInvoke/CMakeLists.txt | 2 +- .../exceptioninterop/CMakeLists.txt | 2 +- .../regressions/Dev11/147911/CMakeLists.txt | 2 +- .../regressions/V1/SEH/VJ/CMakeLists.txt | 2 +- .../exceptions/unhandled/CMakeLists.txt | 2 +- .../SmokeTests/ComWrappers/CMakeLists.txt | 2 +- .../SmokeTests/PInvoke/CMakeLists.txt | 2 +- src/tests/profiler/native/CMakeLists.txt | 2 +- src/tests/readytorun/tests/CMakeLists.txt | 2 +- 109 files changed, 135 insertions(+), 135 deletions(-) diff --git a/src/tests/Common/hostpolicymock/CMakeLists.txt b/src/tests/Common/hostpolicymock/CMakeLists.txt index d66e6e5d234f29..ba75fe9e492141 100644 --- a/src/tests/Common/hostpolicymock/CMakeLists.txt +++ b/src/tests/Common/hostpolicymock/CMakeLists.txt @@ -3,6 +3,6 @@ project (hostpolicy) include_directories(${INC_PLATFORM_DIR}) set(SOURCES HostpolicyMock.cpp ) -add_library(hostpolicy ${TEST_LIB_TYPE} ${SOURCES}) +add_library(hostpolicy SHARED ${SOURCES}) install(TARGETS hostpolicy DESTINATION bin) diff --git a/src/tests/Exceptions/ForeignThread/CMakeLists.txt b/src/tests/Exceptions/ForeignThread/CMakeLists.txt index bdbd576631e3d9..c4e86f63ebad34 100644 --- a/src/tests/Exceptions/ForeignThread/CMakeLists.txt +++ b/src/tests/Exceptions/ForeignThread/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (ForeignThreadExceptionsNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ForeignThreadExceptionsNative SHARED ${SOURCES}) # add the install targets install (TARGETS ForeignThreadExceptionsNative DESTINATION bin) diff --git a/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt b/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt index 392928be2c67c0..47a1e9189dd06f 100644 --- a/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt +++ b/src/tests/Interop/ArrayMarshalling/BoolArray/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES MarshalBoolArrayNative.cpp) # add the executable -add_library (MarshalBoolArrayNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (MarshalBoolArrayNative SHARED ${SOURCES}) target_link_libraries(MarshalBoolArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt b/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt index d297944a85b09a..711e43d181dceb 100644 --- a/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt +++ b/src/tests/Interop/ArrayMarshalling/SafeArray/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SafeArrayNative.cpp RecordNative.cpp) # add the executable -add_library (SafeArrayNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (SafeArrayNative SHARED ${SOURCES}) target_link_libraries(SafeArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/BestFitMapping/CMakeLists.txt b/src/tests/Interop/BestFitMapping/CMakeLists.txt index d96a95a05ce485..a9f2700c79dae5 100644 --- a/src/tests/Interop/BestFitMapping/CMakeLists.txt +++ b/src/tests/Interop/BestFitMapping/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES BestFitMappingNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (BestFitMappingNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (BestFitMappingNative SHARED ${SOURCES}) target_link_libraries(BestFitMappingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt b/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt index e6439cb606a6fb..ec0104a9d381e2 100644 --- a/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt +++ b/src/tests/Interop/COM/ComWrappers/MockReferenceTrackerRuntime/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES ReferenceTrackerRuntime.cpp) # add the shared library -add_library (MockReferenceTrackerRuntime ${TEST_LIB_TYPE} ${SOURCES}) +add_library (MockReferenceTrackerRuntime SHARED ${SOURCES}) target_link_libraries(MockReferenceTrackerRuntime PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt b/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt index 0e54f47f6edd22..25c32ec842ac0e 100644 --- a/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt +++ b/src/tests/Interop/COM/ComWrappers/WeakReference/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES WeakReferenceNative.cpp) # add the shared library -add_library (WeakReferenceNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (WeakReferenceNative SHARED ${SOURCES}) target_link_libraries(WeakReferenceNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt b/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt index 6a41ea40f3a0e3..befba2383cee81 100644 --- a/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt +++ b/src/tests/Interop/COM/Dynamic/Server/CMakeLists.txt @@ -33,7 +33,7 @@ if (CLR_CMAKE_HOST_WIN32) endif() # add the shared library -add_library (${PROJECT_NAME} ${TEST_LIB_TYPE} ${SOURCES}) +add_library (${PROJECT_NAME} SHARED ${SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # Copy manifest file to project output diff --git a/src/tests/Interop/COM/NativeServer/CMakeLists.txt b/src/tests/Interop/COM/NativeServer/CMakeLists.txt index f666c91bb6bf53..33d81d4ee4ce68 100644 --- a/src/tests/Interop/COM/NativeServer/CMakeLists.txt +++ b/src/tests/Interop/COM/NativeServer/CMakeLists.txt @@ -9,7 +9,7 @@ if (CLR_CMAKE_HOST_WIN32) endif() # add the shared library -add_library (COMNativeServer ${TEST_LIB_TYPE} ${SOURCES}) +add_library (COMNativeServer SHARED ${SOURCES}) target_link_libraries(COMNativeServer PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # Copy manifest file to project output diff --git a/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt b/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt index c6fabe4da6e526..20c98adc3cd431 100644 --- a/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt +++ b/src/tests/Interop/DisabledRuntimeMarshalling/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES DisabledRuntimeMarshallingNative.cpp ) # add the executable -add_library (DisabledRuntimeMarshallingNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (DisabledRuntimeMarshallingNative SHARED ${SOURCES}) target_link_libraries(DisabledRuntimeMarshallingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt b/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt index 88cce20c26d172..6718e38aa0f9e1 100644 --- a/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt +++ b/src/tests/Interop/DllImportAttribute/DllImportPath/CMakeLists.txt @@ -6,10 +6,10 @@ set(SOURCES # Additional files to reference: # add the executable -add_library (DllImportPath_Local ${TEST_LIB_TYPE} ${SOURCES}) -add_library (DllImportPath.Local ${TEST_LIB_TYPE} ${SOURCES}) -add_library (DllImportPath_PathEnv ${TEST_LIB_TYPE} ${SOURCES}) -add_library (DllImportPath_Relative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (DllImportPath_Local SHARED ${SOURCES}) +add_library (DllImportPath.Local SHARED ${SOURCES}) +add_library (DllImportPath_PathEnv SHARED ${SOURCES}) +add_library (DllImportPath_Relative SHARED ${SOURCES}) add_executable(DllImportPath_ExeFile ${SOURCES}) target_link_libraries(DllImportPath_Local PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) target_link_libraries(DllImportPath.Local PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt b/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt index b3f0a336436bf0..c491fd782cd398 100644 --- a/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt +++ b/src/tests/Interop/DllImportAttribute/ExactSpelling/CMakeLists.txt @@ -4,7 +4,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES ExactSpellingNative.cpp) # add the executable -add_library (ExactSpellingNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ExactSpellingNative SHARED ${SOURCES}) target_link_libraries(ExactSpellingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt b/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt index d9b318fa31befb..d10d89f1914cef 100644 --- a/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt +++ b/src/tests/Interop/DllImportSearchPaths/NativeLibraryWithDependency/CMakeLists.txt @@ -6,8 +6,8 @@ if (CLR_CMAKE_TARGET_WIN32) string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") endif () -add_library(Dependency ${TEST_LIB_TYPE} Dependency.cpp) +add_library(Dependency SHARED Dependency.cpp) target_link_libraries(Dependency PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) -add_library(NativeLibraryWithDependency ${TEST_LIB_TYPE} NativeLibraryWithDependency.cpp) +add_library(NativeLibraryWithDependency SHARED NativeLibraryWithDependency.cpp) target_link_libraries(NativeLibraryWithDependency PRIVATE Dependency ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt b/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt index db3908ac6f5dea..4287e19d5c8a1e 100644 --- a/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt +++ b/src/tests/Interop/ExecInDefAppDom/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES ExecInDefAppDomDll.cpp ) # add the executable -add_library (ExecInDefAppDomDll ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ExecInDefAppDomDll SHARED ${SOURCES}) target_link_libraries(ExecInDefAppDomDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt b/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt index ace450488c40ad..0193a5357ea739 100644 --- a/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt +++ b/src/tests/Interop/FuncPtrAsDelegateParam/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES FuncPtrAsDelegateParamNative.cpp ) # add the executable -add_library (FuncPtrAsDelegateParamNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (FuncPtrAsDelegateParamNative SHARED ${SOURCES}) target_link_libraries(FuncPtrAsDelegateParamNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/GCBridge/CMakeLists.txt b/src/tests/Interop/GCBridge/CMakeLists.txt index 896e76ab357e17..54245a91fb9a10 100644 --- a/src/tests/Interop/GCBridge/CMakeLists.txt +++ b/src/tests/Interop/GCBridge/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES GCBridgeNative.cpp ) # add the executable -add_library (GCBridgeNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (GCBridgeNative SHARED ${SOURCES}) target_link_libraries(GCBridgeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt b/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt index 93f032af3e56c3..3aa29f7767334e 100644 --- a/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt +++ b/src/tests/Interop/ICustomMarshaler/ConflictingNames/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES CustomMarshalerNative.cpp ) # add the executable -add_library (CustomMarshalerNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (CustomMarshalerNative SHARED ${SOURCES}) target_link_libraries(CustomMarshalerNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt b/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt index 394942bfc064c9..c539029f79c87e 100644 --- a/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt +++ b/src/tests/Interop/ICustomMarshaler/Primitives/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES ICustomMarshalerNative.cpp ) # add the executable -add_library (CustomMarshalersPrimitives ${TEST_LIB_TYPE} ${SOURCES}) +add_library (CustomMarshalersPrimitives SHARED ${SOURCES}) target_link_libraries(CustomMarshalersPrimitives PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt b/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt index 24b3f3cdd06eeb..d082f7c8b134bd 100644 --- a/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt +++ b/src/tests/Interop/IJW/CopyConstructorMarshaler/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwCopyConstructorMarshaler.cpp) # add the shared library -add_library (IjwCopyConstructorMarshaler ${TEST_LIB_TYPE} ${SOURCES}) +add_library (IjwCopyConstructorMarshaler SHARED ${SOURCES}) target_link_libraries(IjwCopyConstructorMarshaler PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) add_ijw_msbuild_project_properties(IjwCopyConstructorMarshaler ijwhost) diff --git a/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt b/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt index f616d1108a7196..e29fbfeae3668e 100644 --- a/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt +++ b/src/tests/Interop/IJW/IjwNativeCallingManagedDll/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwNativeCallingManagedDll.cpp) # add the shared library -add_library (IjwNativeCallingManagedDll ${TEST_LIB_TYPE} ${SOURCES}) +add_library (IjwNativeCallingManagedDll SHARED ${SOURCES}) target_link_libraries(IjwNativeCallingManagedDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt b/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt index f96fc4d4a3c1ca..a8eee97b76437d 100644 --- a/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt +++ b/src/tests/Interop/IJW/IjwNativeDll/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwNativeDll.cpp) # add the shared library -add_library (IjwNativeDll ${TEST_LIB_TYPE} ${SOURCES}) +add_library (IjwNativeDll SHARED ${SOURCES}) target_link_libraries(IjwNativeDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) add_ijw_msbuild_project_properties(IjwNativeDll ijwhost) diff --git a/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt b/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt index 8508da41a73345..a3c7c973a6597d 100644 --- a/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt +++ b/src/tests/Interop/IJW/NativeVarargs/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES IjwNativeVarargs.cpp) # add the shared library -add_library (IjwNativeVarargs ${TEST_LIB_TYPE} ${SOURCES}) +add_library (IjwNativeVarargs SHARED ${SOURCES}) target_link_libraries(IjwNativeVarargs PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) add_ijw_msbuild_project_properties(IjwNativeVarargs ijwhost) diff --git a/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt b/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt index 9a437872c0af49..db5aa92b2e8a8b 100644 --- a/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt +++ b/src/tests/Interop/IJW/ijwhostmock/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES ijwhost.cpp) # add the shared library -add_library (ijwhost ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ijwhost SHARED ${SOURCES}) target_link_libraries(ijwhost PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/LayoutClass/CMakeLists.txt b/src/tests/Interop/LayoutClass/CMakeLists.txt index 74218f0bd51b54..5f5cfe660501f8 100644 --- a/src/tests/Interop/LayoutClass/CMakeLists.txt +++ b/src/tests/Interop/LayoutClass/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES LayoutClassNative.cpp ) # add the executable -add_library (LayoutClassNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (LayoutClassNative SHARED ${SOURCES}) target_link_libraries(LayoutClassNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt b/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt index f46e7dee277cc3..549f9dfcab606b 100644 --- a/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt +++ b/src/tests/Interop/MarshalAPI/FunctionPointer/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES FunctionPointerNative.cpp) # add the executable -add_library (FunctionPointerNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (FunctionPointerNative SHARED ${SOURCES}) target_link_libraries(FunctionPointerNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt b/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt index 3f777ef70e594f..8c7b718beae86f 100644 --- a/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt +++ b/src/tests/Interop/MonoAPI/Native/mono-embedding-api-test/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(${INC_PLATFORM_DIR}) add_subdirectory(${CLR_SRC_NATIVE_DIR}/public public_api) # add the library -add_library (mono-embedding-api-test ${TEST_LIB_TYPE} mono-embedding-api-test.c api-types.h api-functions.h) +add_library (mono-embedding-api-test SHARED mono-embedding-api-test.c api-types.h api-functions.h) set_target_properties(mono-embedding-api-test PROPERTIES MSVC_WARNING_LEVEL 3) target_link_libraries(mono-embedding-api-test PRIVATE monoapi ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt b/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt index 60e72dd587fe18..f64e2e89bf7b90 100644 --- a/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt +++ b/src/tests/Interop/NativeLibrary/NativeLibraryToLoad/CMakeLists.txt @@ -2,15 +2,15 @@ project (NativeLibrary) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the shared library -add_library (NativeLibrary ${TEST_LIB_TYPE} NativeLibrary.cpp) +add_library (NativeLibrary SHARED NativeLibrary.cpp) if (CLR_CMAKE_TARGET_UNIX) target_link_libraries(NativeLibrary PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) endif() # add the shared library -add_library (GlobalLoadHelper ${TEST_LIB_TYPE} GlobalLoadHelper.cpp) +add_library (GlobalLoadHelper SHARED GlobalLoadHelper.cpp) target_link_libraries(GlobalLoadHelper PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) -add_library (GloballyLoadedNativeLibrary ${TEST_LIB_TYPE} GloballyLoadedNativeLibrary.cpp) +add_library (GloballyLoadedNativeLibrary SHARED GloballyLoadedNativeLibrary.cpp) target_link_libraries(GloballyLoadedNativeLibrary PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt b/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt index 53b4c6585ea5a3..39417b1124c9d6 100644 --- a/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt +++ b/src/tests/Interop/ObjectiveC/AutoReleaseTest/CMakeLists.txt @@ -17,5 +17,5 @@ set_source_files_properties(autorelease.m PROPERTIES COMPILE_FLAGS -fno-objc-arc find_library(FOUNDATION Foundation REQUIRED) -add_library(ObjectiveC ${TEST_LIB_TYPE} ${SOURCES}) +add_library(ObjectiveC SHARED ${SOURCES}) target_link_libraries(ObjectiveC PRIVATE ${FOUNDATION}) diff --git a/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt b/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt index ba73b7e3d565e0..bed745f3c1621c 100644 --- a/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt +++ b/src/tests/Interop/ObjectiveC/ObjectiveCMarshalAPI/CMakeLists.txt @@ -9,7 +9,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES NativeObjCMarshalTests.cpp) # add the shared library -add_library (NativeObjCMarshalTests ${TEST_LIB_TYPE} ${SOURCES}) +add_library (NativeObjCMarshalTests SHARED ${SOURCES}) target_link_libraries(NativeObjCMarshalTests PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt b/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt index 60a11c0833d721..445d7c894c929c 100644 --- a/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Array/MarshalArrayAsField/LPArrayNative/CMakeLists.txt @@ -8,7 +8,7 @@ set(SOURCES ) # add the executable -add_library (MarshalArrayByValArrayNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (MarshalArrayByValArrayNative SHARED ${SOURCES}) target_link_libraries(MarshalArrayByValArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS MarshalArrayByValArrayNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt b/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt index 2e9b194ceda123..e5a9e42bdf9f25 100644 --- a/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Array/MarshalArrayAsParam/LPArrayNative/CMakeLists.txt @@ -7,7 +7,7 @@ set(SOURCES ) # add the executable -add_library (MarshalArrayLPArrayNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (MarshalArrayLPArrayNative SHARED ${SOURCES}) target_link_libraries(MarshalArrayLPArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS MarshalArrayLPArrayNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt b/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt index 57748a4a68f25a..395b2013e137e8 100644 --- a/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/ArrayWithOffset/CMakeLists.txt @@ -9,7 +9,7 @@ if(CLR_CMAKE_HOST_WIN32) ) endif(CLR_CMAKE_HOST_WIN32) # add the executable -add_library (ArrayWithOffsetNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ArrayWithOffsetNative SHARED ${SOURCES}) target_link_libraries(ArrayWithOffsetNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS ArrayWithOffsetNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt b/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt index 368e92676813fe..fab42ef717cabc 100644 --- a/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/AsAny/CMakeLists.txt @@ -9,7 +9,7 @@ if(CLR_CMAKE_HOST_WIN32) ) endif(CLR_CMAKE_HOST_WIN32) # add the executable -add_library (AsAnyNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (AsAnyNative SHARED ${SOURCES}) target_link_libraries(AsAnyNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS AsAnyNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt b/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt index 018c00a793e9eb..bd6556422c91f0 100644 --- a/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Attributes/LCID/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES LCIDNative.cpp ) -add_library (LCIDNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (LCIDNative SHARED ${SOURCES}) target_link_libraries(LCIDNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS LCIDNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt b/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt index 3c00037ff7b9f2..af0dd5f83e99f1 100644 --- a/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/BestFitMapping/Char/CMakeLists.txt @@ -4,7 +4,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES BestFitMappingNative.cpp ) -add_library (Char_BestFitMappingNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (Char_BestFitMappingNative SHARED ${SOURCES}) target_link_libraries(Char_BestFitMappingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS Char_BestFitMappingNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt b/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt index fd07f1e6ef9e32..a2802113f30163 100644 --- a/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/BestFitMapping/LPStr/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES BestFitMappingNative.cpp ) -add_library (LPStr_BestFitMappingNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (LPStr_BestFitMappingNative SHARED ${SOURCES}) target_link_libraries(LPStr_BestFitMappingNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS LPStr_BestFitMappingNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt b/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt index 0b0bc3d96fa09e..ce827099c4d7bd 100644 --- a/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/CriticalHandles/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES CriticalHandlesNative.cpp ) # add the executable -add_library (CriticalHandlesNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (CriticalHandlesNative SHARED ${SOURCES}) target_link_libraries(CriticalHandlesNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS CriticalHandlesNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt b/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt index 10aa58f20754e0..31c3fc87be7d7b 100644 --- a/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/CustomMarshalers/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES CustomMarshalersNative.cpp ) # add the executable -add_library (CustomMarshalersNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (CustomMarshalersNative SHARED ${SOURCES}) target_link_libraries(CustomMarshalersNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt b/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt index c0a68b2655eeb0..6010a0b00d57e4 100644 --- a/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/DateTime/CMakeLists.txt @@ -4,7 +4,7 @@ set(SOURCES NativeDateTime.cpp ) # add the executable -add_library (NativeDateTime ${TEST_LIB_TYPE} ${SOURCES}) +add_library (NativeDateTime SHARED ${SOURCES}) target_link_libraries(NativeDateTime PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS NativeDateTime DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt b/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt index 01b2ff3f2c175d..cad9c50f07f6e0 100644 --- a/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Decimal/CMakeLists.txt @@ -3,6 +3,6 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES DecimalTestNative.cpp ) -add_library (DecimalTestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (DecimalTestNative SHARED ${SOURCES}) target_link_libraries(DecimalTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) install (TARGETS DecimalTestNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt b/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt index e56e1b2dbc5002..92aaf73d67931f 100644 --- a/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Delegate/CMakeLists.txt @@ -9,5 +9,5 @@ if (CLR_CMAKE_TARGET_WIN32) endif() # add the executable -add_library (DelegateTestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (DelegateTestNative SHARED ${SOURCES}) target_link_libraries(DelegateTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) diff --git a/src/tests/Interop/PInvoke/Generics/CMakeLists.txt b/src/tests/Interop/PInvoke/Generics/CMakeLists.txt index 7ee6704f85dfff..62baff4017164c 100644 --- a/src/tests/Interop/PInvoke/Generics/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Generics/CMakeLists.txt @@ -73,5 +73,5 @@ set(SOURCES GenericsNative.VectorL.cpp GenericsNative.VectorU.cpp ) -add_library (GenericsNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (GenericsNative SHARED ${SOURCES}) install (TARGETS GenericsNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt b/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt index 35362086c9da22..0c303cfc982763 100644 --- a/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/IEnumerator/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES IEnumeratorNative.cpp ) # add the executable -add_library (IEnumeratorNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (IEnumeratorNative SHARED ${SOURCES}) target_link_libraries(IEnumeratorNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Int128/CMakeLists.txt b/src/tests/Interop/PInvoke/Int128/CMakeLists.txt index f385a86da1d7b0..17690db349b4b0 100644 --- a/src/tests/Interop/PInvoke/Int128/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Int128/CMakeLists.txt @@ -4,5 +4,5 @@ set(SOURCES Int128Native.cpp UInt128Native.cpp ) -add_library (Int128Native ${TEST_LIB_TYPE} ${SOURCES}) +add_library (Int128Native SHARED ${SOURCES}) install (TARGETS Int128Native DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt b/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt index 84a5e56ad56fd3..e4975485c62510 100644 --- a/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Miscellaneous/HandleRef/CMakeLists.txt @@ -7,6 +7,6 @@ set(SOURCES # Additional files to reference: # HandleRefNative.def # add the executable -add_library (HandleRefNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (HandleRefNative SHARED ${SOURCES}) # add the install targets install (TARGETS HandleRefNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt b/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt index bf0a952a1b8112..fb6e84958422d1 100644 --- a/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Miscellaneous/MultipleAssembliesWithSamePInvoke/CMakeLists.txt @@ -5,6 +5,6 @@ set(SOURCES MAWSPINative.cpp ) # add the executable -add_library (MAWSPINative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (MAWSPINative SHARED ${SOURCES}) # add the install targets install (TARGETS MAWSPINative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt b/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt index bcb93a5a7ff4fa..924b6a8f7f32e2 100644 --- a/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/NativeCallManagedComVisible/CMakeLists.txt @@ -6,6 +6,6 @@ set(SOURCES ) # Additional files to reference: # add the executable -add_library (ComVisibleNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ComVisibleNative SHARED ${SOURCES}) # add the install targets install (TARGETS ComVisibleNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt b/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt index c74d70fb2bc1e0..25cfea57d8c618 100644 --- a/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Primitives/Int/CMakeLists.txt @@ -1,6 +1,6 @@ project (PInvokeIntNative) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES PInvokeIntNative.cpp) -add_library (PInvokeIntNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (PInvokeIntNative SHARED ${SOURCES}) # add the install targets install (TARGETS PInvokeIntNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt b/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt index 4f6240d6be0d22..0d8bf6e334e20d 100644 --- a/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Primitives/Pointer/CMakeLists.txt @@ -2,5 +2,5 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES PointerNative.cpp ) -add_library (PointerNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (PointerNative SHARED ${SOURCES}) install (TARGETS PointerNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt b/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt index acbd7c25b54f1f..9b22fecb263478 100644 --- a/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Primitives/RuntimeHandles/CMakeLists.txt @@ -1,6 +1,6 @@ project (RuntimeHandlesNative) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES RuntimeHandlesNative.cpp) -add_library (RuntimeHandlesNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (RuntimeHandlesNative SHARED ${SOURCES}) # add the install targets install (TARGETS RuntimeHandlesNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt b/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt index 115d1e6ceebb26..da7391f4035305 100644 --- a/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SafeHandles/CMakeLists.txt @@ -3,6 +3,6 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SafeHandleNative.cpp ) -add_library (SafeHandleNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (SafeHandleNative SHARED ${SOURCES}) target_link_libraries(SafeHandleNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) install (TARGETS SafeHandleNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt b/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt index d24a36a7e92114..6cc6928999aff5 100644 --- a/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SetLastError/CMakeLists.txt @@ -3,7 +3,7 @@ include("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SetLastErrorNative.cpp) # add the shared library -add_library(SetLastErrorNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library(SetLastErrorNative SHARED ${SOURCES}) target_link_libraries(SetLastErrorNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt index 9be08dad4a2888..2bbda0182f716d 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByOut/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES PInvokePassingByOutNative.cpp ) # add the executable -add_library (PInvokePassingByOutNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (PInvokePassingByOutNative SHARED ${SOURCES}) target_link_libraries(PInvokePassingByOutNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS PInvokePassingByOutNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt index dbeb22196363d4..bf9d8c9c288550 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/PInvoke/PassingByRef/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES PInvokePassingByRefNative.cpp ) # add the executable -add_library (PInvokePassingByRefNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (PInvokePassingByRefNative SHARED ${SOURCES}) target_link_libraries(PInvokePassingByRefNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS PInvokePassingByRefNative DESTINATION bin) diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt index 693c990be39853..65df81bce9f71d 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt @@ -6,7 +6,7 @@ set(SOURCES ) # Additional files to reference: # add the executable -add_library (RPIP_ByOutNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (RPIP_ByOutNative SHARED ${SOURCES}) set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative) target_link_libraries(RPIP_ByOutNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt index ca25eb8307e979..bfac0325b011a9 100644 --- a/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt @@ -6,7 +6,7 @@ set(SOURCES ) # Additional files to reference: # add the executable -add_library (RPIP_ByRefNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (RPIP_ByRefNative SHARED ${SOURCES}) set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative) target_link_libraries(RPIP_ByRefNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt b/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt index 57303a20354429..b4f45d0f342fd7 100644 --- a/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Varargs/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES VarargsNative.cpp ) # add the executable -add_library (VarargsNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (VarargsNative SHARED ${SOURCES}) target_link_libraries(VarargsNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PInvoke/Variant/CMakeLists.txt b/src/tests/Interop/PInvoke/Variant/CMakeLists.txt index d89db6ed9b5682..2cfedc6573bef1 100644 --- a/src/tests/Interop/PInvoke/Variant/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Variant/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES VariantNative.cpp) # add the executable -add_library (VariantNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (VariantNative SHARED ${SOURCES}) if(CLR_CMAKE_HOST_WIN32) list(APPEND LINK_LIBRARIES_ADDITIONAL diff --git a/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt b/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt index 53e94b0bd896c4..285855cf24ca8d 100644 --- a/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt +++ b/src/tests/Interop/PInvoke/Vector2_3_4/CMakeLists.txt @@ -3,6 +3,6 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES Vector2_3_4TestNative.cpp ) -add_library (Vector2_3_4TestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (Vector2_3_4TestNative SHARED ${SOURCES}) target_link_libraries(Vector2_3_4TestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) install (TARGETS Vector2_3_4TestNative DESTINATION bin) diff --git a/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt b/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt index ecd1c463882608..9e3d9515f5d54e 100644 --- a/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt +++ b/src/tests/Interop/PrimitiveMarshalling/Bool/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES BoolNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (BoolNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (BoolNative SHARED ${SOURCES}) target_link_libraries(BoolNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) #get_cmake_property(_variableNames VARIABLES) diff --git a/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt b/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt index 6c078b21717da6..a90046bcc99544 100644 --- a/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt +++ b/src/tests/Interop/PrimitiveMarshalling/EnumMarshalling/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES MarshalEnumNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (MarshalEnumNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (MarshalEnumNative SHARED ${SOURCES}) target_link_libraries(MarshalEnumNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt b/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt index db646d259171ba..1d38872d792cdc 100644 --- a/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt +++ b/src/tests/Interop/PrimitiveMarshalling/UIntPtr/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES UIntPtrNative.cpp ) # add the executable -add_library (UIntPtrNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (UIntPtrNative SHARED ${SOURCES}) target_link_libraries(UIntPtrNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/RefCharArray/CMakeLists.txt b/src/tests/Interop/RefCharArray/CMakeLists.txt index 0188b1c09596b0..aa6105e15a07a1 100644 --- a/src/tests/Interop/RefCharArray/CMakeLists.txt +++ b/src/tests/Interop/RefCharArray/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES RefCharArrayNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (RefCharArrayNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (RefCharArrayNative SHARED ${SOURCES}) target_link_libraries(RefCharArrayNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/SimpleStruct/CMakeLists.txt b/src/tests/Interop/SimpleStruct/CMakeLists.txt index 4e8308adb1e78b..b3d50930d867e5 100644 --- a/src/tests/Interop/SimpleStruct/CMakeLists.txt +++ b/src/tests/Interop/SimpleStruct/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SimpleStructNative.cpp ) # add the executable -add_library (SimpleStructNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (SimpleStructNative SHARED ${SOURCES}) target_link_libraries(SimpleStructNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt index 1bba75363efff5..2e8b2fb2270f04 100644 --- a/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/AnsiBSTR/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES AnsiBStrTestNative.cpp) # add the executable -add_library (AnsiBStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (AnsiBStrTestNative SHARED ${SOURCES}) if(CLR_CMAKE_HOST_WIN32) list(APPEND LINK_LIBRARIES_ADDITIONAL diff --git a/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt index 69df3faf7b24d5..226f128f400bbb 100644 --- a/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/BSTR/CMakeLists.txt @@ -2,7 +2,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES BStrTestNative.cpp) # add the executable -add_library (BStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (BStrTestNative SHARED ${SOURCES}) if(CLR_CMAKE_HOST_WIN32) list(APPEND LINK_LIBRARIES_ADDITIONAL diff --git a/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt index a7692141f9cf4c..6f5e933def9d5f 100644 --- a/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/LPSTR/CMakeLists.txt @@ -2,7 +2,7 @@ set(SOURCES LPStrTestNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (LPStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (LPStrTestNative SHARED ${SOURCES}) target_link_libraries(LPStrTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt b/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt index 87c71d92db5f07..a3c838faf4565d 100644 --- a/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/LPTSTR/CMakeLists.txt @@ -2,7 +2,7 @@ set(SOURCES LPTStrTestNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (LPTStrTestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (LPTStrTestNative SHARED ${SOURCES}) target_link_libraries(LPTStrTestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt b/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt index 6d41c7f700a2dd..dd50b710457224 100644 --- a/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/UTF8/CMakeLists.txt @@ -3,7 +3,7 @@ set(SOURCES UTF8TestNative.cpp ) include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") # add the executable -add_library (UTF8TestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (UTF8TestNative SHARED ${SOURCES}) target_link_libraries(UTF8TestNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt b/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt index 471d53298e492b..79039283d55f57 100644 --- a/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt +++ b/src/tests/Interop/StringMarshalling/VBByRefStr/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES VBByRefStrNative.cpp ) # add the executable -add_library (VBByRefStrNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (VBByRefStrNative SHARED ${SOURCES}) target_link_libraries(VBByRefStrNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt b/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt index 07782905a63656..199e1d9440df8e 100644 --- a/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt +++ b/src/tests/Interop/StructMarshalling/PInvoke/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES MarshalStructAsParamDLL.cpp) # add the executable -add_library (MarshalStructAsParam ${TEST_LIB_TYPE} ${SOURCES}) +add_library (MarshalStructAsParam SHARED ${SOURCES}) target_link_libraries(MarshalStructAsParam PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt index 9ede9b607a38ba..b27d067e33a8ae 100644 --- a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt +++ b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalExpStruct/CMakeLists.txt @@ -5,7 +5,7 @@ set(SOURCES ExpStructAsParamNative.cpp ) # add the executable -add_library (ReversePInvokeNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ReversePInvokeNative SHARED ${SOURCES}) target_link_libraries(ReversePInvokeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS ReversePInvokeNative DESTINATION bin) diff --git a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt index 0155d892653cbd..8a9f9c23f99a38 100644 --- a/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt +++ b/src/tests/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SeqStructDelRevPInvokeNative.cpp ) -add_library (SeqPInvokeNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (SeqPInvokeNative SHARED ${SOURCES}) target_link_libraries(SeqPInvokeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS SeqPInvokeNative DESTINATION bin) diff --git a/src/tests/Interop/SuppressGCTransition/CMakeLists.txt b/src/tests/Interop/SuppressGCTransition/CMakeLists.txt index 9d278d1972bfd7..663b8e5d440113 100644 --- a/src/tests/Interop/SuppressGCTransition/CMakeLists.txt +++ b/src/tests/Interop/SuppressGCTransition/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES SuppressGCTransitionNative.cpp ) -add_library (SuppressGCTransitionNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (SuppressGCTransitionNative SHARED ${SOURCES}) target_link_libraries(SuppressGCTransitionNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets install (TARGETS SuppressGCTransitionNative DESTINATION bin) diff --git a/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt b/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt index 23779084dea813..93a124bb5a54e0 100644 --- a/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt +++ b/src/tests/Interop/UnmanagedCallConv/CMakeLists.txt @@ -3,7 +3,7 @@ Include("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES UnmanagedCallConvNative.cpp ) # add the executable -add_library(${PROJECT_NAME} ${TEST_LIB_TYPE} ${SOURCES}) +add_library(${PROJECT_NAME} SHARED ${SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt b/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt index bf3cf8d070854a..37e5fa5e669839 100644 --- a/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt +++ b/src/tests/Interop/UnmanagedCallersOnly/CMakeLists.txt @@ -3,7 +3,7 @@ include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") set(SOURCES UnmanagedCallersOnlyDll.cpp ) # add the executable -add_library (UnmanagedCallersOnlyDll ${TEST_LIB_TYPE} ${SOURCES}) +add_library (UnmanagedCallersOnlyDll SHARED ${SOURCES}) target_link_libraries(UnmanagedCallersOnlyDll PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/JIT/Directed/Convert/CMakeLists.txt b/src/tests/JIT/Directed/Convert/CMakeLists.txt index 0711fd1223dccf..077085bd2e2399 100644 --- a/src/tests/JIT/Directed/Convert/CMakeLists.txt +++ b/src/tests/JIT/Directed/Convert/CMakeLists.txt @@ -2,7 +2,7 @@ project (out_of_range_fp_to_int_conversionsnative) include_directories(${INC_PLATFORM_DIR}) # add the executable -add_library (out_of_range_fp_to_int_conversionsnative ${TEST_LIB_TYPE} out_of_range_fp_to_int_conversions.cpp) +add_library (out_of_range_fp_to_int_conversionsnative SHARED out_of_range_fp_to_int_conversions.cpp) # add the install targets install (TARGETS out_of_range_fp_to_int_conversionsnative DESTINATION bin) diff --git a/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt b/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt index b6e052ae072e1a..20cb7991ed09ad 100644 --- a/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt +++ b/src/tests/JIT/Directed/PrimitiveABI/CMakeLists.txt @@ -7,6 +7,6 @@ else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -Oz") endif() -add_library (PrimitiveABINative ${TEST_LIB_TYPE} PrimitiveABI.c) +add_library (PrimitiveABINative SHARED PrimitiveABI.c) install (TARGETS PrimitiveABINative DESTINATION bin) diff --git a/src/tests/JIT/Directed/StructABI/CMakeLists.txt b/src/tests/JIT/Directed/StructABI/CMakeLists.txt index 37442c2be92e33..cf028a3c8670e8 100644 --- a/src/tests/JIT/Directed/StructABI/CMakeLists.txt +++ b/src/tests/JIT/Directed/StructABI/CMakeLists.txt @@ -9,8 +9,8 @@ else() endif() # add the executable -add_library (StructABILib ${TEST_LIB_TYPE} StructABI.c) -add_library (EmptyStructsLib ${TEST_LIB_TYPE} EmptyStructs.cpp) +add_library (StructABILib SHARED StructABI.c) +add_library (EmptyStructsLib SHARED EmptyStructs.cpp) # add the install targets install (TARGETS StructABILib EmptyStructsLib DESTINATION bin) diff --git a/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt b/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt index 16760e64f5fc11..cc07026a86f45e 100644 --- a/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt +++ b/src/tests/JIT/Directed/aliasing_retbuf/CMakeLists.txt @@ -3,5 +3,5 @@ project(AliasingRetBufNative) # This test always needs to be optimized to hit the problem. set(CMAKE_BUILD_TYPE Release) -add_library(AliasingRetBufNative ${TEST_LIB_TYPE} aliasing_retbuf_native.cpp) +add_library(AliasingRetBufNative SHARED aliasing_retbuf_native.cpp) diff --git a/src/tests/JIT/Directed/arglist/CMakeLists.txt b/src/tests/JIT/Directed/arglist/CMakeLists.txt index 6ddf5453d2ab78..eaa75ccf09ab37 100644 --- a/src/tests/JIT/Directed/arglist/CMakeLists.txt +++ b/src/tests/JIT/Directed/arglist/CMakeLists.txt @@ -8,7 +8,7 @@ else() endif() # add the executable -add_library (varargnative ${TEST_LIB_TYPE} varargnative.c) +add_library (varargnative SHARED varargnative.c) # add the install targets install (TARGETS varargnative DESTINATION bin) diff --git a/src/tests/JIT/Directed/callconv/CMakeLists.txt b/src/tests/JIT/Directed/callconv/CMakeLists.txt index 138fdb4c2c3152..97d95ebef8fb20 100644 --- a/src/tests/JIT/Directed/callconv/CMakeLists.txt +++ b/src/tests/JIT/Directed/callconv/CMakeLists.txt @@ -4,16 +4,16 @@ set(SOURCES InstanceCallConvTest.cpp ) -add_library (ThisCallNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ThisCallNative SHARED ${SOURCES}) target_compile_definitions(ThisCallNative PRIVATE INSTANCE_CALLCONV=__thiscall) -add_library (StdCallMemberFunctionNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (StdCallMemberFunctionNative SHARED ${SOURCES}) target_compile_definitions(StdCallMemberFunctionNative PRIVATE INSTANCE_CALLCONV=__stdcall) -add_library (CdeclMemberFunctionNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (CdeclMemberFunctionNative SHARED ${SOURCES}) target_compile_definitions(CdeclMemberFunctionNative PRIVATE INSTANCE_CALLCONV=__cdecl) -add_library (PlatformDefaultMemberFunctionNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (PlatformDefaultMemberFunctionNative SHARED ${SOURCES}) target_compile_definitions(PlatformDefaultMemberFunctionNative PRIVATE INSTANCE_CALLCONV=STDMETHODCALLTYPE) install (TARGETS ThisCallNative DESTINATION bin) diff --git a/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt b/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt index 3019dea7198ebb..3b412d93042273 100644 --- a/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt +++ b/src/tests/JIT/Directed/pinning/object-pin/CMakeLists.txt @@ -1,4 +1,4 @@ project(object_pin_mirror) -add_library(mirror ${TEST_LIB_TYPE} mirror.cpp) +add_library(mirror SHARED mirror.cpp) SET_TARGET_PROPERTIES(mirror PROPERTIES COMPILE_FLAGS "-c") diff --git a/src/tests/JIT/Directed/pinvoke/CMakeLists.txt b/src/tests/JIT/Directed/pinvoke/CMakeLists.txt index f046b845164bf6..48b0bfa1c4cf69 100644 --- a/src/tests/JIT/Directed/pinvoke/CMakeLists.txt +++ b/src/tests/JIT/Directed/pinvoke/CMakeLists.txt @@ -1,4 +1,4 @@ project(PInvokeExampleNative) -add_library(PInvokeExampleNative ${TEST_LIB_TYPE} pinvokeexamplenative.cpp) +add_library(PInvokeExampleNative SHARED pinvokeexamplenative.cpp) SET_TARGET_PROPERTIES(PInvokeExampleNative PROPERTIES COMPILE_FLAGS "-c") diff --git a/src/tests/JIT/Directed/tls/CMakeLists.txt b/src/tests/JIT/Directed/tls/CMakeLists.txt index a4836ee3dbc6b0..3eaf0d3b22a0c0 100644 --- a/src/tests/JIT/Directed/tls/CMakeLists.txt +++ b/src/tests/JIT/Directed/tls/CMakeLists.txt @@ -3,6 +3,6 @@ include_directories(${INC_PLATFORM_DIR}) -add_library(usetls ${TEST_LIB_TYPE} testtls.cpp) +add_library(usetls SHARED testtls.cpp) install (TARGETS usetls DESTINATION bin) diff --git a/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt b/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt index 8ffe5ecf75cea9..13049b20763450 100644 --- a/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt +++ b/src/tests/JIT/Methodical/gc_poll/CMakeLists.txt @@ -4,7 +4,7 @@ set(SOURCES GCPollNative.cpp ) -add_library (GCPollNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (GCPollNative SHARED ${SOURCES}) # add the install targets install (TARGETS GCPollNative DESTINATION bin) diff --git a/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt b/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt index b3c1a4711756ca..b36677f461415c 100644 --- a/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt +++ b/src/tests/JIT/Methodical/structs/systemvbringup/CMakeLists.txt @@ -1,4 +1,4 @@ project(jitstructtests) set(SOURCES structinregs.cpp structinregs.def) -add_library(jitstructtests_lib ${TEST_LIB_TYPE} ${SOURCES}) +add_library(jitstructtests_lib SHARED ${SOURCES}) diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt b/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt index b42ec99c906e9b..2dd7b9df74344f 100644 --- a/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt +++ b/src/tests/JIT/Regression/JitBlue/Runtime_101046/CMakeLists.txt @@ -3,5 +3,5 @@ include_directories(${INC_PLATFORM_DIR}) # This test always needs to be optimized to hit the problem. set(CMAKE_BUILD_TYPE Release) -add_library(Runtime101046Native ${TEST_LIB_TYPE} Runtime_101046.cpp) +add_library(Runtime101046Native SHARED Runtime_101046.cpp) target_link_libraries(Runtime101046Native PRIVATE platformdefines) diff --git a/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt b/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt index 78b3c75878cb03..2cdee0de43a7a6 100644 --- a/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt +++ b/src/tests/JIT/Regression/JitBlue/Runtime_76194/CMakeLists.txt @@ -1,3 +1,3 @@ include_directories(${INC_PLATFORM_DIR}) -add_library(CrossplatVirtualAlloc ${TEST_LIB_TYPE} CrossplatVirtualAlloc.cpp) +add_library(CrossplatVirtualAlloc SHARED CrossplatVirtualAlloc.cpp) target_link_libraries(CrossplatVirtualAlloc PRIVATE platformdefines) diff --git a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt index 382fdd280cc5f1..9226518586e3d5 100644 --- a/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt +++ b/src/tests/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt @@ -1,5 +1,5 @@ project(b108129_test2) include_directories(${INC_PLATFORM_DIR}) -add_library(test2 ${TEST_LIB_TYPE} test2.cpp) +add_library(test2 SHARED test2.cpp) SET_TARGET_PROPERTIES(test2 PROPERTIES COMPILE_FLAGS "-c") diff --git a/src/tests/JIT/SIMD/CMakeLists.txt b/src/tests/JIT/SIMD/CMakeLists.txt index f88bd15e5860e9..a5127be36f4658 100644 --- a/src/tests/JIT/SIMD/CMakeLists.txt +++ b/src/tests/JIT/SIMD/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${INC_PLATFORM_DIR}) set(SOURCES Vector3TestNative.cpp ) # add the executable -add_library (Vector3TestNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (Vector3TestNative SHARED ${SOURCES}) # add the install targets install (TARGETS Vector3TestNative DESTINATION bin) diff --git a/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt b/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt index e378db09ccf58f..57dda096197d67 100644 --- a/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt +++ b/src/tests/JIT/jit64/hfa/main/dll/CMakeLists.txt @@ -1,14 +1,14 @@ project(hfa_interop) -add_library(hfa_simple_f32_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) +add_library(hfa_simple_f32_native_cpp SHARED hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_simple_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DSIMPLE_HFA -DFLOAT32") -add_library(hfa_simple_f64_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) +add_library(hfa_simple_f64_native_cpp SHARED hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_simple_f64_native_cpp PROPERTIES COMPILE_FLAGS "-c -DSIMPLE_HFA -DFLOAT64") -add_library(hfa_nested_f32_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) +add_library(hfa_nested_f32_native_cpp SHARED hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_nested_f32_native_cpp PROPERTIES COMPILE_FLAGS "-c -DNESTED_HFA -DFLOAT32") -add_library(hfa_nested_f64_native_cpp ${TEST_LIB_TYPE} hfa_native.cpp) +add_library(hfa_nested_f64_native_cpp SHARED hfa_native.cpp) SET_TARGET_PROPERTIES(hfa_nested_f64_native_cpp PROPERTIES COMPILE_FLAGS "-c -DNESTED_HFA -DFLOAT64") diff --git a/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt b/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt index 4ad6622ec2d56c..ca6502d07cc97a 100644 --- a/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt +++ b/src/tests/JIT/jit64/mcc/interop/CMakeLists.txt @@ -1,17 +1,17 @@ project(mcc_native) -add_library(native_i0c ${TEST_LIB_TYPE} native_i0c.cpp) -add_library(native_i1c ${TEST_LIB_TYPE} native_i1c.cpp) -add_library(native_i3c ${TEST_LIB_TYPE} native_i3c.cpp) -add_library(native_i5c ${TEST_LIB_TYPE} native_i5c.cpp) -add_library(native_i6c ${TEST_LIB_TYPE} native_i6c.cpp) -add_library(native_i7c ${TEST_LIB_TYPE} native_i7c.cpp) -add_library(native_i8c ${TEST_LIB_TYPE} native_i8c.cpp) +add_library(native_i0c SHARED native_i0c.cpp) +add_library(native_i1c SHARED native_i1c.cpp) +add_library(native_i3c SHARED native_i3c.cpp) +add_library(native_i5c SHARED native_i5c.cpp) +add_library(native_i6c SHARED native_i6c.cpp) +add_library(native_i7c SHARED native_i7c.cpp) +add_library(native_i8c SHARED native_i8c.cpp) -add_library(native_i0s ${TEST_LIB_TYPE} native_i0s.cpp) -add_library(native_i1s ${TEST_LIB_TYPE} native_i1s.cpp) -add_library(native_i3s ${TEST_LIB_TYPE} native_i3s.cpp) -add_library(native_i5s ${TEST_LIB_TYPE} native_i5s.cpp) -add_library(native_i6s ${TEST_LIB_TYPE} native_i6s.cpp) -add_library(native_i7s ${TEST_LIB_TYPE} native_i7s.cpp) -add_library(native_i8s ${TEST_LIB_TYPE} native_i8s.cpp) +add_library(native_i0s SHARED native_i0s.cpp) +add_library(native_i1s SHARED native_i1s.cpp) +add_library(native_i3s SHARED native_i3s.cpp) +add_library(native_i5s SHARED native_i5s.cpp) +add_library(native_i6s SHARED native_i6s.cpp) +add_library(native_i7s SHARED native_i7s.cpp) +add_library(native_i8s SHARED native_i8s.cpp) diff --git a/src/tests/Loader/NativeLibs/CMakeLists.txt b/src/tests/Loader/NativeLibs/CMakeLists.txt index 88acf3d9218a08..905e25c68023ed 100644 --- a/src/tests/Loader/NativeLibs/CMakeLists.txt +++ b/src/tests/Loader/NativeLibs/CMakeLists.txt @@ -3,6 +3,6 @@ project(FromNativePaths_lib) set(CMAKE_SHARED_LIBRARY_PREFIX "") set(SOURCES FromNativePaths_lib.cpp) -add_library(FromNativePaths_lib ${TEST_LIB_TYPE} ${SOURCES}) +add_library(FromNativePaths_lib SHARED ${SOURCES}) install(TARGETS FromNativePaths_lib DESTINATION Loader/NativeLibs) diff --git a/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt b/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt index f12589b057de06..03d44205e8f714 100644 --- a/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt +++ b/src/tests/Regressions/coreclr/GitHub_102887/CMakeLists.txt @@ -2,7 +2,7 @@ if (CLR_CMAKE_TARGET_APPLE) include_directories(${INC_PLATFORM_DIR}) - add_library(nativetest102887 ${TEST_LIB_TYPE} nativetest102887.cpp) + add_library(nativetest102887 SHARED nativetest102887.cpp) # add the install targets install (TARGETS nativetest102887 DESTINATION bin) diff --git a/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt b/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt index 5cc46844c4c2ff..ee32f08007f630 100644 --- a/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt +++ b/src/tests/Regressions/coreclr/GitHub_111242/CMakeLists.txt @@ -9,7 +9,7 @@ else() endif() # add the executable -add_library (Test111242Lib ${TEST_LIB_TYPE} Test111242.c) +add_library (Test111242Lib SHARED Test111242.c) # add the install targets install (TARGETS Test111242Lib DESTINATION bin) diff --git a/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt b/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt index af39031378d90e..e50bf224c6fed4 100644 --- a/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt +++ b/src/tests/Regressions/coreclr/GitHub_117393/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES nativetest117393.cpp) # add the shared library -add_library (nativetest117393 ${TEST_LIB_TYPE} ${SOURCES}) +add_library (nativetest117393 SHARED ${SOURCES}) target_link_libraries(nativetest117393 PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/baseservices/CET/CMakeLists.txt b/src/tests/baseservices/CET/CMakeLists.txt index fba597da94d59f..226738c71f862f 100644 --- a/src/tests/baseservices/CET/CMakeLists.txt +++ b/src/tests/baseservices/CET/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(cet_check ${TEST_LIB_TYPE} CETCheck.cpp) +add_library(cet_check SHARED CETCheck.cpp) # add the install targets install (TARGETS cet_check DESTINATION bin) diff --git a/src/tests/baseservices/callconvs/CMakeLists.txt b/src/tests/baseservices/callconvs/CMakeLists.txt index cf67004ac3308a..7a557e3039b487 100644 --- a/src/tests/baseservices/callconvs/CMakeLists.txt +++ b/src/tests/baseservices/callconvs/CMakeLists.txt @@ -1,7 +1,7 @@ project (NativeFunctions) include_directories(${INC_PLATFORM_DIR}) -add_library (NativeFunctions ${TEST_LIB_TYPE} NativeFunctions.cpp) +add_library (NativeFunctions SHARED NativeFunctions.cpp) # add the install targets install (TARGETS NativeFunctions DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt index fc76378ebdb7a1..c3f82e3261a881 100644 --- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/Foreign/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (ForeignUnhandledNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (ForeignUnhandledNative SHARED ${SOURCES}) # add the install targets install (TARGETS ForeignUnhandledNative DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt index 3d00721aebdc17..82d0216e586660 100644 --- a/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/UnhandledExceptionHandler/PInvoke/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (PInvokeUnhandledNative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (PInvokeUnhandledNative SHARED ${SOURCES}) # add the install targets install (TARGETS PInvokeUnhandledNative DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt b/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt index e7677cd0822e3a..a477a57c1cdbdc 100644 --- a/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/exceptioninterop/CMakeLists.txt @@ -1,4 +1,4 @@ include_directories(${INC_PLATFORM_DIR}) -add_library(ExceptionInteropNative ${TEST_LIB_TYPE} ExceptionInteropNative.cpp) +add_library(ExceptionInteropNative SHARED ExceptionInteropNative.cpp) target_link_libraries(ExceptionInteropNative PRIVATE platformdefines) \ No newline at end of file diff --git a/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt b/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt index c8c34bc68871e4..51ca76c8f9135c 100644 --- a/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/regressions/Dev11/147911/CMakeLists.txt @@ -3,7 +3,7 @@ project (fpcw) include_directories(${INC_PLATFORM_DIR}) # add the executable -add_library (fpcw ${TEST_LIB_TYPE} fpcw.cpp) +add_library (fpcw SHARED fpcw.cpp) # add the install targets install (TARGETS fpcw DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt index 2e199af8147da9..059c9d6444d402 100644 --- a/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/regressions/V1/SEH/VJ/CMakeLists.txt @@ -3,7 +3,7 @@ project (Unmanaged) include_directories(${INC_PLATFORM_DIR}) # add the executable -add_library (Unmanaged ${TEST_LIB_TYPE} Unmanaged.cpp) +add_library (Unmanaged SHARED Unmanaged.cpp) # add the install targets install (TARGETS Unmanaged DESTINATION bin) diff --git a/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt b/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt index 5ef7b4c736e912..b08c1aa651ed67 100644 --- a/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt +++ b/src/tests/baseservices/exceptions/unhandled/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT CLR_CMAKE_HOST_WIN32) endif() # add the executable -add_library (unhandlednative ${TEST_LIB_TYPE} ${SOURCES}) +add_library (unhandlednative SHARED ${SOURCES}) # add the install targets install (TARGETS unhandlednative DESTINATION bin) diff --git a/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt b/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt index bef510a6898e39..a631acce2c89d0 100644 --- a/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt +++ b/src/tests/nativeaot/SmokeTests/ComWrappers/CMakeLists.txt @@ -1,7 +1,7 @@ project (ComWrappersNative) include_directories(${INC_PLATFORM_DIR}) -add_library (ComWrappersNative ${TEST_LIB_TYPE} ComWrappersNative.cpp) +add_library (ComWrappersNative SHARED ComWrappersNative.cpp) # add the install targets install (TARGETS ComWrappersNative DESTINATION bin) diff --git a/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt b/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt index d312b26180e6c2..7aabb442144009 100644 --- a/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt +++ b/src/tests/nativeaot/SmokeTests/PInvoke/CMakeLists.txt @@ -7,7 +7,7 @@ if(CLR_CMAKE_HOST_WIN32) ) endif(CLR_CMAKE_HOST_WIN32) -add_library (PInvokeNative ${TEST_LIB_TYPE} PInvokeNative.cpp) +add_library (PInvokeNative SHARED PInvokeNative.cpp) target_link_libraries(PInvokeNative PRIVATE ${LINK_LIBRARIES_ADDITIONAL}) # add the install targets diff --git a/src/tests/profiler/native/CMakeLists.txt b/src/tests/profiler/native/CMakeLists.txt index 94658271b9056f..a0590d61d1127e 100644 --- a/src/tests/profiler/native/CMakeLists.txt +++ b/src/tests/profiler/native/CMakeLists.txt @@ -49,7 +49,7 @@ if(NOT WIN32) endif(NOT WIN32) # add the executable -add_library(Profiler ${TEST_LIB_TYPE} ${SOURCES}) +add_library(Profiler SHARED ${SOURCES}) if(WIN32) set(DEPENDENCIES Advapi32.lib oleaut32.lib Ole32.lib) diff --git a/src/tests/readytorun/tests/CMakeLists.txt b/src/tests/readytorun/tests/CMakeLists.txt index 43586789469b2e..19c217fd854997 100644 --- a/src/tests/readytorun/tests/CMakeLists.txt +++ b/src/tests/readytorun/tests/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories( ${INC_PLATFORM_DIR} ) set(SOURCES native.cpp) -add_library(nativelibrary ${TEST_LIB_TYPE} ${SOURCES}) +add_library(nativelibrary SHARED ${SOURCES}) install(TARGETS nativelibrary DESTINATION bin) From bd4d969f2fcccd90cb51ff95809702e57b94fbc4 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Tue, 7 Oct 2025 22:30:12 +0200 Subject: [PATCH 27/27] -fwasm-exceptions back --- src/coreclr/CMakeLists.txt | 3 +++ src/coreclr/hosts/corerun/CMakeLists.txt | 1 + src/coreclr/hosts/corewasmrun/CMakeLists.txt | 1 + src/coreclr/pal/CMakeLists.txt | 3 +++ src/mono/mono/mini/CMakeLists.txt | 1 + src/native/corehost/browserhost/CMakeLists.txt | 1 + src/tests/CMakeLists.txt | 3 +++ 7 files changed, 13 insertions(+) diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt index 77f54eb6211986..2bc06d83bc8495 100644 --- a/src/coreclr/CMakeLists.txt +++ b/src/coreclr/CMakeLists.txt @@ -39,6 +39,9 @@ if (CLR_CMAKE_TARGET_ARCH_WASM) add_compile_options( -fwasm-exceptions -msimd128) + add_link_options( + -fwasm-exceptions + ) endif() #---------------------------------------------------- diff --git a/src/coreclr/hosts/corerun/CMakeLists.txt b/src/coreclr/hosts/corerun/CMakeLists.txt index 6738b20842aba6..56aa91453621fe 100644 --- a/src/coreclr/hosts/corerun/CMakeLists.txt +++ b/src/coreclr/hosts/corerun/CMakeLists.txt @@ -68,6 +68,7 @@ else(CLR_CMAKE_HOST_WIN32) LINK_FLAGS "--pre-js ${JS_CORE_RUN_PRE} --js-library ${JS_SYSTEM_NATIVE_BROWSER} --js-library ${JS_SYSTEM_BROWSER_UTILS}" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") target_link_options(corerun PRIVATE + -fwasm-exceptions -sEXIT_RUNTIME=1 -sINITIAL_MEMORY=134217728 -sENVIRONMENT=node,shell diff --git a/src/coreclr/hosts/corewasmrun/CMakeLists.txt b/src/coreclr/hosts/corewasmrun/CMakeLists.txt index 6697310031257c..a8ed9e8c996f8b 100644 --- a/src/coreclr/hosts/corewasmrun/CMakeLists.txt +++ b/src/coreclr/hosts/corewasmrun/CMakeLists.txt @@ -32,6 +32,7 @@ set_target_properties(corewasmrun PROPERTIES LINK_FLAGS "--pre-js ${JS_CORE_WASM_RUN_PRE} --js-library ${JS_SYSTEM_NATIVE_BROWSER} --js-library ${JS_SYSTEM_BROWSER_UTILS}" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") target_link_options(corewasmrun PRIVATE + -fwasm-exceptions -sEXIT_RUNTIME=1 -sINITIAL_MEMORY=134217728 -sSTACK_SIZE=5MB diff --git a/src/coreclr/pal/CMakeLists.txt b/src/coreclr/pal/CMakeLists.txt index 52ceb0c2e1b3ff..7c83e540be6907 100644 --- a/src/coreclr/pal/CMakeLists.txt +++ b/src/coreclr/pal/CMakeLists.txt @@ -13,6 +13,9 @@ else() -fwasm-exceptions -msimd128 ) + add_link_options( + -fwasm-exceptions + ) endif() add_subdirectory(src) diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt index a4aab97f5685c6..23b8d15bf708f1 100644 --- a/src/mono/mono/mini/CMakeLists.txt +++ b/src/mono/mono/mini/CMakeLists.txt @@ -477,6 +477,7 @@ if(HOST_BROWSER) add_library(mono-wasm-eh-wasm STATIC llvm-runtime.cpp) target_link_libraries (mono-wasm-eh-wasm PRIVATE monoapi eglib_api) set_target_properties(mono-wasm-eh-wasm PROPERTIES COMPILE_FLAGS "-fwasm-exceptions") + set_target_properties(mono-wasm-eh-wasm PROPERTIES LINK_FLAGS "-fwasm-exceptions") install(TARGETS mono-wasm-eh-wasm LIBRARY) endif() diff --git a/src/native/corehost/browserhost/CMakeLists.txt b/src/native/corehost/browserhost/CMakeLists.txt index d24bdaa836d3b2..375d17c3cb9257 100644 --- a/src/native/corehost/browserhost/CMakeLists.txt +++ b/src/native/corehost/browserhost/CMakeLists.txt @@ -92,6 +92,7 @@ target_link_options(browserhost PRIVATE -sEXPORTED_RUNTIME_METHODS=UTF8ToString,cwrap,ccall,HEAPU8,HEAPU32,HEAPU64,BROWSER_HOST -sEXPORTED_FUNCTIONS=_posix_memalign,_free,stackAlloc,stackRestore,stackSave,_BrowserHost_InitializeCoreCLR,_BrowserHost_ExecuteAssembly,___cpp_exception -sEXPORT_NAME=createDotnetRuntime + -fwasm-exceptions -lnodefs.js -Wno-unused-command-line-argument -Wl,-error-limit=0) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index eaa20860a45080..26c19240be13bb 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -71,6 +71,9 @@ else() add_compile_options( -fwasm-exceptions -msimd128) + add_link_options( + -fwasm-exceptions + ) # opt in into tests that make sense for WASM add_subdirectory(JIT/interpreter)