diff --git a/src/coreclr/binder/CMakeLists.txt b/src/coreclr/binder/CMakeLists.txt index 28797e0c682a05..f52dcb6bb44ef7 100644 --- a/src/coreclr/binder/CMakeLists.txt +++ b/src/coreclr/binder/CMakeLists.txt @@ -56,10 +56,5 @@ endif(CLR_CMAKE_TARGET_WIN32) convert_to_absolute_path(BINDER_SOURCES ${BINDER_SOURCES}) -add_library_clr(v3binder_obj - OBJECT - ${BINDER_SOURCES} -) -add_dependencies(v3binder_obj eventing_headers) -add_library(v3binder INTERFACE) -target_sources(v3binder INTERFACE $) +add_library_clr(v3binder OBJECT ${BINDER_SOURCES}) +add_dependencies(v3binder eventing_headers) diff --git a/src/coreclr/classlibnative/bcltype/CMakeLists.txt b/src/coreclr/classlibnative/bcltype/CMakeLists.txt index fdcf344c16ac56..265be7e1cf17f2 100644 --- a/src/coreclr/classlibnative/bcltype/CMakeLists.txt +++ b/src/coreclr/classlibnative/bcltype/CMakeLists.txt @@ -10,11 +10,5 @@ set(BCLTYPE_SOURCES variant.cpp ) -add_library_clr(bcltype_obj - OBJECT - ${BCLTYPE_SOURCES} -) - -add_dependencies(bcltype_obj eventing_headers) -add_library(bcltype INTERFACE) -target_sources(bcltype INTERFACE $) +add_library_clr(bcltype OBJECT ${BCLTYPE_SOURCES}) +add_dependencies(bcltype eventing_headers) diff --git a/src/coreclr/classlibnative/float/CMakeLists.txt b/src/coreclr/classlibnative/float/CMakeLists.txt index b2c47ea39b65ea..a3032c4887c4ba 100644 --- a/src/coreclr/classlibnative/float/CMakeLists.txt +++ b/src/coreclr/classlibnative/float/CMakeLists.txt @@ -7,12 +7,5 @@ set(FLOAT_SOURCES floatsingle.cpp ) -add_library_clr(comfloat_wks_obj - OBJECT - ${FLOAT_SOURCES} -) - -add_dependencies(comfloat_wks_obj eventing_headers) - -add_library(comfloat_wks INTERFACE) -target_sources(comfloat_wks INTERFACE $) \ No newline at end of file +add_library_clr(comfloat_wks OBJECT ${FLOAT_SOURCES}) +add_dependencies(comfloat_wks eventing_headers) diff --git a/src/coreclr/debug/debug-pal/CMakeLists.txt b/src/coreclr/debug/debug-pal/CMakeLists.txt index 2836dcd58710fa..baa11c163dffe3 100644 --- a/src/coreclr/debug/debug-pal/CMakeLists.txt +++ b/src/coreclr/debug/debug-pal/CMakeLists.txt @@ -46,6 +46,4 @@ if(CLR_CMAKE_HOST_UNIX) endif(CLR_CMAKE_HOST_UNIX) -add_library_clr(debug-pal_obj OBJECT ${TWO_WAY_PIPE_SOURCES}) -add_library(debug-pal INTERFACE) -target_sources(debug-pal INTERFACE $) +add_library_clr(debug-pal OBJECT ${TWO_WAY_PIPE_SOURCES}) diff --git a/src/coreclr/debug/ee/wks/CMakeLists.txt b/src/coreclr/debug/ee/wks/CMakeLists.txt index f50bc8f6fb6d59..7702a397489769 100644 --- a/src/coreclr/debug/ee/wks/CMakeLists.txt +++ b/src/coreclr/debug/ee/wks/CMakeLists.txt @@ -1,5 +1,4 @@ if (CLR_CMAKE_TARGET_WIN32) - list(APPEND CORDBEE_SOURCES_WKS ${CORDBEE_HEADERS_WKS}) get_include_directories(ASM_INCLUDE_DIRECTORIES) @@ -8,16 +7,15 @@ if (CLR_CMAKE_TARGET_WIN32) set(ASM_FILE ${CORDBEE_DIR}/${ARCH_SOURCES_DIR}/dbghelpers.asm) if(CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_LOONGARCH64) - preprocess_files(ASM_FILE ${ASM_FILE}) + if (CMAKE_GENERATOR MATCHES "Visual Studio") - compile_asm(TARGET cordbee_wks_obj ASM_FILES ${ASM_FILE} OUTPUT_OBJECTS ASM_OBJECTS) + compile_asm(TARGET cordbee_wks ASM_FILES ${ASM_FILE} OUTPUT_OBJECTS ASM_OBJECTS) endif() - add_library_clr(cordbee_wks_obj OBJECT ${CORDBEE_SOURCES_WKS} ${ASM_FILE} ${ASM_OBJECTS}) + add_library_clr(cordbee_wks OBJECT ${CORDBEE_SOURCES_WKS} ${ASM_FILE} ${ASM_OBJECTS}) else () - set(ASM_OPTIONS /c /Zi /W3 /errorReport:prompt) if (CLR_CMAKE_HOST_ARCH_I386) @@ -25,18 +23,18 @@ if (CLR_CMAKE_TARGET_WIN32) endif (CLR_CMAKE_HOST_ARCH_I386) set_source_files_properties(${ASM_FILE} PROPERTIES COMPILE_OPTIONS "${ASM_OPTIONS}") - - add_library_clr(cordbee_wks_obj OBJECT ${CORDBEE_SOURCES_WKS} ${ASM_FILE}) + add_library_clr(cordbee_wks OBJECT ${CORDBEE_SOURCES_WKS} ${ASM_FILE}) endif() else () - - add_library_clr(cordbee_wks_obj OBJECT ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) + add_library_clr(cordbee_wks + OBJECT + ${CORDBEE_SOURCES_WKS} + ../${ARCH_SOURCES_DIR}/dbghelpers.S + ) endif (CLR_CMAKE_TARGET_WIN32) -target_precompile_headers(cordbee_wks_obj PRIVATE [["stdafx.h"]]) -add_dependencies(cordbee_wks_obj eventing_headers) -add_library(cordbee_wks INTERFACE) -target_sources(cordbee_wks INTERFACE $) +target_precompile_headers(cordbee_wks PRIVATE [["stdafx.h"]]) +add_dependencies(cordbee_wks eventing_headers) diff --git a/src/coreclr/dlls/mscorrc/CMakeLists.txt b/src/coreclr/dlls/mscorrc/CMakeLists.txt index 30b2bf1eda69da..a8a363b1cc34db 100644 --- a/src/coreclr/dlls/mscorrc/CMakeLists.txt +++ b/src/coreclr/dlls/mscorrc/CMakeLists.txt @@ -19,14 +19,10 @@ if(CLR_CMAKE_HOST_WIN32) add_library_clr(mscorrc SHARED include.rc ) - install_clr(TARGETS mscorrc DESTINATIONS . sharedFramework COMPONENT runtime) + else() build_resources(${CMAKE_CURRENT_SOURCE_DIR}/include.rc mscorrc TARGET_CPP_FILE) + add_library_clr(mscorrc OBJECT ${TARGET_CPP_FILE}) - add_library_clr(mscorrc_obj OBJECT - ${TARGET_CPP_FILE} - ) - add_library(mscorrc INTERFACE) - target_sources(mscorrc INTERFACE $) endif(CLR_CMAKE_HOST_WIN32) diff --git a/src/coreclr/gcinfo/CMakeLists.txt b/src/coreclr/gcinfo/CMakeLists.txt index c66a334be7dee4..3885cc14a0a4c3 100644 --- a/src/coreclr/gcinfo/CMakeLists.txt +++ b/src/coreclr/gcinfo/CMakeLists.txt @@ -1,12 +1,12 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) -set( GCINFO_ALLARCH_SOURCES +set(GCINFO_ALLARCH_SOURCES arraylist.cpp gcinfoencoder.cpp simplerhash.cpp ) -set( GCINFO_I386_SOURCES +set(GCINFO_I386_SOURCES ../gcdump/gcdump.cpp ../gcdump/i386/gcdumpx86.cpp ) @@ -24,13 +24,7 @@ if(CLR_CMAKE_TARGET_ARCH_I386) endif(CLR_CMAKE_TARGET_ARCH_I386) -add_library_clr(gcinfo_obj - OBJECT - ${GCINFO_SOURCES} -) - -add_library(gcinfo INTERFACE) -target_sources(gcinfo INTERFACE $) +add_library_clr(gcinfo OBJECT ${GCINFO_SOURCES}) install (FILES gcinfoencoder.cpp DESTINATION gcinfo) diff --git a/src/coreclr/inc/CMakeLists.txt b/src/coreclr/inc/CMakeLists.txt index cae1e5c07b7565..f6724ee385f673 100644 --- a/src/coreclr/inc/CMakeLists.txt +++ b/src/coreclr/inc/CMakeLists.txt @@ -56,9 +56,7 @@ if(FEATURE_JIT_PITCHING) endif(FEATURE_JIT_PITCHING) # Compile *_i.cpp to lib -add_library_clr(corguids_obj OBJECT ${CORGUIDS_SOURCES}) -add_library(corguids INTERFACE) -target_sources(corguids INTERFACE $) +add_library_clr(corguids OBJECT ${CORGUIDS_SOURCES}) # Binplace the inc files for packaging later. diff --git a/src/coreclr/interop/CMakeLists.txt b/src/coreclr/interop/CMakeLists.txt index 942071587810d9..d591616f1eb281 100644 --- a/src/coreclr/interop/CMakeLists.txt +++ b/src/coreclr/interop/CMakeLists.txt @@ -30,10 +30,4 @@ endif(FEATURE_COMWRAPPERS) convert_to_absolute_path(INTEROP_SOURCES ${INTEROP_SOURCES}) -add_library_clr(interop_obj - OBJECT - ${INTEROP_SOURCES} -) - -add_library(interop INTERFACE) -target_sources(interop INTERFACE $) \ No newline at end of file +add_library_clr(interop OBJECT ${INTEROP_SOURCES}) diff --git a/src/coreclr/jit/static/CMakeLists.txt b/src/coreclr/jit/static/CMakeLists.txt index 99ae15963b506c..89dd2bc72e8a89 100644 --- a/src/coreclr/jit/static/CMakeLists.txt +++ b/src/coreclr/jit/static/CMakeLists.txt @@ -2,18 +2,15 @@ project(ClrJit) set_source_files_properties(${JIT_EXPORTS_FILE} PROPERTIES GENERATED TRUE) -add_library_clr(clrjit_obj +add_library_clr(clrjit_static OBJECT ${JIT_SOURCES} ${JIT_ARCH_SOURCES} ) if(CLR_CMAKE_HOST_UNIX) - add_dependencies(clrjit_obj coreclrpal gcinfo) + add_dependencies(clrjit_static coreclrpal gcinfo) endif(CLR_CMAKE_HOST_UNIX) -target_include_directories(clrjit_obj PRIVATE ${JIT_SOURCE_DIR}) -target_precompile_headers(clrjit_obj PRIVATE [["jitpch.h"]]) - -add_library(clrjit_static INTERFACE) -target_sources(clrjit_static INTERFACE $) +target_include_directories(clrjit_static PRIVATE ${JIT_SOURCE_DIR}) +target_precompile_headers(clrjit_static PRIVATE [["jitpch.h"]]) diff --git a/src/coreclr/md/ceefilegen/CMakeLists.txt b/src/coreclr/md/ceefilegen/CMakeLists.txt index aaae88889080e4..24c55715a9ee13 100644 --- a/src/coreclr/md/ceefilegen/CMakeLists.txt +++ b/src/coreclr/md/ceefilegen/CMakeLists.txt @@ -25,11 +25,5 @@ if (CLR_CMAKE_TARGET_WIN32) list(APPEND CEEFILEGEN_SOURCES ${CEEFILEGEN_HEADERS}) endif (CLR_CMAKE_TARGET_WIN32) -add_library_clr(ceefgen_obj - OBJECT - ${CEEFILEGEN_SOURCES} -) -target_precompile_headers(ceefgen_obj PRIVATE stdafx.h) - -add_library(ceefgen INTERFACE) -target_sources(ceefgen INTERFACE $) +add_library_clr(ceefgen OBJECT ${CEEFILEGEN_SOURCES}) +target_precompile_headers(ceefgen PRIVATE stdafx.h) diff --git a/src/coreclr/md/compiler/CMakeLists.txt b/src/coreclr/md/compiler/CMakeLists.txt index 2182d0ebf4cd92..2adf73ebc46a74 100644 --- a/src/coreclr/md/compiler/CMakeLists.txt +++ b/src/coreclr/md/compiler/CMakeLists.txt @@ -65,11 +65,9 @@ add_library_clr(mdcompiler_dac ${MDCOMPILER_SOURCES}) set_target_properties(mdcompiler_dac PROPERTIES DAC_COMPONENT TRUE) target_precompile_headers(mdcompiler_dac PRIVATE stdafx.h) -add_library_clr(mdcompiler_wks_obj OBJECT ${MDCOMPILER_WKS_SOURCES}) -target_compile_definitions(mdcompiler_wks_obj PRIVATE FEATURE_METADATA_EMIT_ALL) -target_precompile_headers(mdcompiler_wks_obj PRIVATE stdafx.h) -add_library(mdcompiler_wks INTERFACE) -target_sources(mdcompiler_wks INTERFACE $) +add_library_clr(mdcompiler_wks OBJECT ${MDCOMPILER_WKS_SOURCES}) +target_compile_definitions(mdcompiler_wks PRIVATE FEATURE_METADATA_EMIT_ALL) +target_precompile_headers(mdcompiler_wks PRIVATE stdafx.h) add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES}) set_target_properties(mdcompiler-dbi PROPERTIES DBI_COMPONENT TRUE) diff --git a/src/coreclr/md/enc/CMakeLists.txt b/src/coreclr/md/enc/CMakeLists.txt index 89eae322ad00be..5b96ed8d87c976 100644 --- a/src/coreclr/md/enc/CMakeLists.txt +++ b/src/coreclr/md/enc/CMakeLists.txt @@ -51,11 +51,9 @@ add_library_clr(mdruntimerw_dac ${MDRUNTIMERW_SOURCES}) set_target_properties(mdruntimerw_dac PROPERTIES DAC_COMPONENT TRUE) target_precompile_headers(mdruntimerw_dac PRIVATE stdafx.h) -add_library_clr(mdruntimerw_wks_obj OBJECT ${MDRUNTIMERW_SOURCES}) -target_compile_definitions(mdruntimerw_wks_obj PRIVATE FEATURE_METADATA_EMIT_ALL) -target_precompile_headers(mdruntimerw_wks_obj PRIVATE stdafx.h) -add_library(mdruntimerw_wks INTERFACE) -target_sources(mdruntimerw_wks INTERFACE $) +add_library_clr(mdruntimerw_wks OBJECT ${MDRUNTIMERW_SOURCES}) +target_compile_definitions(mdruntimerw_wks PRIVATE FEATURE_METADATA_EMIT_ALL) +target_precompile_headers(mdruntimerw_wks PRIVATE stdafx.h) add_library_clr(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES}) set_target_properties(mdruntimerw-dbi PROPERTIES DBI_COMPONENT TRUE) diff --git a/src/coreclr/md/runtime/CMakeLists.txt b/src/coreclr/md/runtime/CMakeLists.txt index 579451ef6d6b35..293de03ee8bc4a 100644 --- a/src/coreclr/md/runtime/CMakeLists.txt +++ b/src/coreclr/md/runtime/CMakeLists.txt @@ -47,11 +47,9 @@ add_library_clr(mdruntime_dac ${MDRUNTIME_SOURCES}) set_target_properties(mdruntime_dac PROPERTIES DAC_COMPONENT TRUE) target_precompile_headers(mdruntime_dac PRIVATE stdafx.h) -add_library_clr(mdruntime_wks_obj OBJECT ${MDRUNTIME_SOURCES}) -target_compile_definitions(mdruntime_wks_obj PRIVATE FEATURE_METADATA_EMIT_ALL) -target_precompile_headers(mdruntime_wks_obj PRIVATE stdafx.h) -add_library(mdruntime_wks INTERFACE) -target_sources(mdruntime_wks INTERFACE $) +add_library_clr(mdruntime_wks OBJECT ${MDRUNTIME_SOURCES}) +target_compile_definitions(mdruntime_wks PRIVATE FEATURE_METADATA_EMIT_ALL) +target_precompile_headers(mdruntime_wks PRIVATE stdafx.h) add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES}) set_target_properties(mdruntime-dbi PROPERTIES DBI_COMPONENT TRUE) diff --git a/src/coreclr/pal/src/CMakeLists.txt b/src/coreclr/pal/src/CMakeLists.txt index 0fe6c0f04e590a..32895b2f4def58 100644 --- a/src/coreclr/pal/src/CMakeLists.txt +++ b/src/coreclr/pal/src/CMakeLists.txt @@ -255,12 +255,7 @@ endif(NOT FEATURE_CROSSBITNESS) # > warning for library: libtracepointprovider.a the table of contents is empty (no object file members in the library define global symbols) # if(CLR_CMAKE_TARGET_LINUX) - add_library(tracepointprovider_obj - OBJECT - misc/tracepointprovider.cpp - ) - add_library(tracepointprovider INTERFACE) - target_sources(tracepointprovider INTERFACE $) + add_library(tracepointprovider OBJECT misc/tracepointprovider.cpp) endif(CLR_CMAKE_TARGET_LINUX) if(CLR_CMAKE_TARGET_OSX) diff --git a/src/coreclr/unwinder/CMakeLists.txt b/src/coreclr/unwinder/CMakeLists.txt index 10b2d7c4088d2a..c63712c500e695 100644 --- a/src/coreclr/unwinder/CMakeLists.txt +++ b/src/coreclr/unwinder/CMakeLists.txt @@ -20,10 +20,8 @@ list(APPEND UNWINDER_SOURCES convert_to_absolute_path(UNWINDER_SOURCES ${UNWINDER_SOURCES}) if(CLR_CMAKE_HOST_UNIX) - add_library_clr(unwinder_wks_obj OBJECT ${UNWINDER_SOURCES}) - add_dependencies(unwinder_wks_obj eventing_headers) - add_library(unwinder_wks INTERFACE) - target_sources(unwinder_wks INTERFACE $) + add_library_clr(unwinder_wks OBJECT ${UNWINDER_SOURCES}) + add_dependencies(unwinder_wks eventing_headers) endif(CLR_CMAKE_HOST_UNIX) add_library_clr(unwinder_dac ${UNWINDER_SOURCES}) diff --git a/src/coreclr/utilcode/CMakeLists.txt b/src/coreclr/utilcode/CMakeLists.txt index b9ec88816b54e7..ec543e707d7185 100644 --- a/src/coreclr/utilcode/CMakeLists.txt +++ b/src/coreclr/utilcode/CMakeLists.txt @@ -86,9 +86,7 @@ convert_to_absolute_path(UTILCODE_DAC_SOURCES ${UTILCODE_DAC_SOURCES}) convert_to_absolute_path(UTILCODE_STATICNOHOST_SOURCES ${UTILCODE_STATICNOHOST_SOURCES}) add_library_clr(utilcode_dac STATIC ${UTILCODE_DAC_SOURCES}) -add_library_clr(utilcode_obj OBJECT ${UTILCODE_SOURCES}) -add_library(utilcode INTERFACE) -target_sources(utilcode INTERFACE $) +add_library_clr(utilcode OBJECT ${UTILCODE_SOURCES}) add_library_clr(utilcodestaticnohost STATIC ${UTILCODE_STATICNOHOST_SOURCES}) target_link_libraries(utilcodestaticnohost PUBLIC coreclrminipal) @@ -98,7 +96,7 @@ if(CLR_CMAKE_HOST_UNIX) target_link_libraries(utilcode_dac PUBLIC nativeresourcestring) target_link_libraries(utilcode INTERFACE nativeresourcestring) add_dependencies(utilcode_dac coreclrpal) - add_dependencies(utilcode_obj coreclrpal) + add_dependencies(utilcode coreclrpal) endif(CLR_CMAKE_HOST_UNIX) @@ -114,8 +112,8 @@ set_target_properties(utilcode_dac PROPERTIES DAC_COMPONENT TRUE) target_compile_definitions(utilcode_dac PRIVATE SELF_NO_HOST) target_compile_definitions(utilcodestaticnohost PRIVATE SELF_NO_HOST) add_dependencies(utilcode_dac ${UTILCODE_DEPENDENCIES}) -add_dependencies(utilcode_obj ${UTILCODE_DEPENDENCIES}) +add_dependencies(utilcode ${UTILCODE_DEPENDENCIES}) add_dependencies(utilcodestaticnohost ${UTILCODE_DEPENDENCIES}) target_precompile_headers(utilcode_dac PRIVATE [["stdafx.h"]]) -target_precompile_headers(utilcode_obj PRIVATE [["stdafx.h"]]) +target_precompile_headers(utilcode PRIVATE [["stdafx.h"]]) target_precompile_headers(utilcodestaticnohost PRIVATE [["stdafx.h"]]) diff --git a/src/coreclr/vm/wks/CMakeLists.txt b/src/coreclr/vm/wks/CMakeLists.txt index b8c5b2a3698c32..e519458d736e2e 100644 --- a/src/coreclr/vm/wks/CMakeLists.txt +++ b/src/coreclr/vm/wks/CMakeLists.txt @@ -8,12 +8,12 @@ if (CLR_CMAKE_TARGET_WIN32) endif (CLR_CMAKE_TARGET_WIN32) add_library_clr(cee_wks_core OBJECT ${VM_SOURCES_WKS} ${VM_SOURCES_WKS_ARCH_ASM}) -add_library_clr(cee_wks_obj OBJECT ${VM_SOURCES_WKS_SPECIAL}) -add_library_clr(cee_wks_mergeable_obj OBJECT ${VM_SOURCES_WKS_SPECIAL}) +add_library_clr(cee_wks OBJECT ${VM_SOURCES_WKS_SPECIAL}) +add_library_clr(cee_wks_mergeable OBJECT ${VM_SOURCES_WKS_SPECIAL}) target_precompile_headers(cee_wks_core PRIVATE [["common.h"]]) -target_precompile_headers(cee_wks_obj PRIVATE [["common.h"]]) -target_precompile_headers(cee_wks_mergeable_obj PRIVATE [["common.h"]]) +target_precompile_headers(cee_wks PRIVATE [["common.h"]]) +target_precompile_headers(cee_wks_mergeable PRIVATE [["common.h"]]) if (MSVC) # corelib.cpp does not compile with precompiled header file @@ -21,8 +21,8 @@ if (MSVC) endif() add_dependencies(cee_wks_core eventing_headers) -add_dependencies(cee_wks_obj eventing_headers) -add_dependencies(cee_wks_mergeable_obj eventing_headers) +add_dependencies(cee_wks eventing_headers) +add_dependencies(cee_wks_mergeable eventing_headers) if (CLR_CMAKE_TARGET_WIN32) if(NOT CLR_CMAKE_HOST_ARCH_ARM AND NOT CLR_CMAKE_HOST_ARCH_ARM64) @@ -38,25 +38,19 @@ if (CLR_CMAKE_TARGET_WIN32) add_custom_target(asmconstants_inc DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/AsmConstants.inc) add_dependencies(cee_wks_core asmconstants_inc) - add_dependencies(cee_wks_obj asmconstants_inc) - add_dependencies(cee_wks_mergeable_obj asmconstants_inc) + add_dependencies(cee_wks asmconstants_inc) + add_dependencies(cee_wks_mergeable asmconstants_inc) endif(NOT CLR_CMAKE_HOST_ARCH_ARM AND NOT CLR_CMAKE_HOST_ARCH_ARM64) endif (CLR_CMAKE_TARGET_WIN32) add_custom_target(precompiled_asm DEPENDS ${VM_WKS_ARCH_ASM_OBJECTS}) add_dependencies(cee_wks_core precompiled_asm) -add_dependencies(cee_wks_obj precompiled_asm) -add_dependencies(cee_wks_mergeable_obj precompiled_asm) +add_dependencies(cee_wks precompiled_asm) +add_dependencies(cee_wks_mergeable precompiled_asm) - -target_compile_definitions(cee_wks_mergeable_obj PUBLIC FEATURE_MERGE_JIT_AND_ENGINE) -target_compile_definitions(cee_wks_mergeable_obj PUBLIC CORECLR_EMBEDDED) - -add_library(cee_wks INTERFACE) -target_sources(cee_wks INTERFACE $ $ ${VM_WKS_ARCH_ASM_OBJECTS}) -add_library(cee_wks_mergeable INTERFACE) -target_sources(cee_wks_mergeable INTERFACE $ $ ${VM_WKS_ARCH_ASM_OBJECTS}) +target_compile_definitions(cee_wks_mergeable PUBLIC FEATURE_MERGE_JIT_AND_ENGINE) +target_compile_definitions(cee_wks_mergeable PUBLIC CORECLR_EMBEDDED) if (CLR_CMAKE_HOST_WIN32) link_natvis_sources_for_target(cee_wks INTERFACE ../vm.natvis)