From edbd34433f2624d92902931e8ee7f8b2148c0ede Mon Sep 17 00:00:00 2001 From: Jacek Blaszczynski Date: Sun, 18 Nov 2018 21:08:31 +0100 Subject: [PATCH] Add headers to all md*, v3binder*, and ceefgen vcxproj (#20163) Work toward #14884 --- src/binder/CMakeLists.txt | 57 +++++++++++++++++++++++++++- src/md/ceefilegen/CMakeLists.txt | 14 +++++++ src/md/compiler/CMakeLists.txt | 29 ++++++++++++++ src/md/compiler/crossgen/CMakeLists.txt | 5 +++ src/md/compiler/dac/CMakeLists.txt | 5 +++ src/md/compiler/dbi/CMakeLists.txt | 7 +++- src/md/compiler/wks/CMakeLists.txt | 5 +++ src/md/datasource/CMakeLists.txt | 10 ++++- src/md/datasource/dbi/CMakeLists.txt | 7 +++- src/md/enc/CMakeLists.txt | 32 ++++++++++++++++ src/md/enc/crossgen/CMakeLists.txt | 5 +++ src/md/enc/dac/CMakeLists.txt | 5 +++ src/md/enc/dbi/CMakeLists.txt | 7 +++- src/md/enc/wks/CMakeLists.txt | 5 +++ src/md/hotdata/CMakeLists.txt | 16 ++++++++ src/md/hotdata/crossgen/CMakeLists.txt | 5 +++ src/md/hotdata/dac/CMakeLists.txt | 4 ++ src/md/hotdata/full-staticcrt/CMakeLists.txt | 5 +++ src/md/hotdata/full/CMakeLists.txt | 4 ++ src/md/runtime/CMakeLists.txt | 28 ++++++++++++++ src/md/runtime/crossgen/CMakeLists.txt | 5 +++ src/md/runtime/dac/CMakeLists.txt | 4 ++ src/md/runtime/dbi/CMakeLists.txt | 8 +++- src/md/runtime/wks/CMakeLists.txt | 6 ++- src/md/winmd/CMakeLists.txt | 14 +++++++ src/md/winmd/crossgen/CMakeLists.txt | 5 +++ src/md/winmd/dac/CMakeLists.txt | 5 +++ src/md/winmd/dbi/CMakeLists.txt | 7 +++- src/md/winmd/wks/CMakeLists.txt | 5 +++ 29 files changed, 306 insertions(+), 8 deletions(-) diff --git a/src/binder/CMakeLists.txt b/src/binder/CMakeLists.txt index 84b35b9..4600873 100644 --- a/src/binder/CMakeLists.txt +++ b/src/binder/CMakeLists.txt @@ -2,7 +2,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories(BEFORE "../vm/${ARCH_SOURCES_DIR}") include_directories(BEFORE "../vm") include_directories(BEFORE "inc") - + set(BINDER_COMMON_SOURCES variables.cpp utils.cpp @@ -25,15 +25,70 @@ set(BINDER_COMMON_SOURCES fusionhelpers.cpp ) +set(BINDER_COMMON_HEADERS + inc/applicationcontext.hpp + inc/applicationcontext.inl + inc/assembly.hpp + inc/assembly.inl + inc/assemblybinder.hpp + inc/assemblyentry.hpp + inc/assemblyhashtraits.hpp + inc/assemblyidentity.hpp + inc/assemblyidentitycache.hpp + inc/assemblyname.hpp + inc/assemblyname.inl + inc/assemblyversion.hpp + inc/assemblyversion.inl + inc/binderinterface.hpp + inc/bindertypes.hpp + inc/bindinglog.hpp + inc/bindinglog.inl + inc/bindresult.hpp + inc/bindresult.inl + inc/cdebuglog.hpp + inc/clrprivbindercoreclr.h + inc/coreclrbindercommon.h + inc/debuglog.hpp + inc/failurecache.hpp + inc/failurecachehashtraits.hpp + inc/fusionassemblyname.hpp + inc/fusionhelpers.hpp + inc/list.hpp + inc/loadcontext.hpp + inc/loadcontext.inl + inc/propertyhashtraits.hpp + inc/propertymap.hpp + inc/stringlexer.hpp + inc/stringlexer.inl + inc/textualidentityparser.hpp + inc/utils.hpp + inc/variables.hpp +) + set(BINDER_SOURCES ${BINDER_COMMON_SOURCES} clrprivbinderassemblyloadcontext.cpp ) +set(BINDER_HEADERS + ${BINDER_COMMON_HEADERS} + inc/clrprivbinderassemblyloadcontext.h + inc/contextentry.hpp +) + set(BINDER_CROSSGEN_SOURCES ${BINDER_COMMON_SOURCES} ) +set(BINDER_CROSSGEN_HEADERS + ${BINDER_COMMON_HEADERS} +) + +if (WIN32) + list(APPEND BINDER_SOURCES ${BINDER_HEADERS}) + list(APPEND BINDER_CROSSGEN_SOURCES ${BINDER_CROSSGEN_HEADERS}) +endif(WIN32) + convert_to_absolute_path(BINDER_SOURCES ${BINDER_SOURCES}) convert_to_absolute_path(BINDER_CROSSGEN_SOURCES ${BINDER_CROSSGEN_SOURCES}) diff --git a/src/md/ceefilegen/CMakeLists.txt b/src/md/ceefilegen/CMakeLists.txt index a1b9107..7170fac 100644 --- a/src/md/ceefilegen/CMakeLists.txt +++ b/src/md/ceefilegen/CMakeLists.txt @@ -11,12 +11,26 @@ set(CEEFILEGEN_SOURCES pesectionman.cpp ) +set(CEEFILEGEN_HEADERS + ../../inc/corpriv.h + ../../inc/blobfetcher.h + ../../inc/ceegen.h + ../../inc/ceegentokenmapper.h + ../../inc/ceesectionstring.h + ../../inc/pesectionman.h + ../../inc/utilcode.h +) + if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) endif(CLR_CMAKE_PLATFORM_UNIX) add_precompiled_header(stdafx.h stdafx.cpp CEEFILEGEN_SOURCES) +if (WIN32) + list(APPEND CEEFILEGEN_SOURCES ${CEEFILEGEN_HEADERS}) +endif (WIN32) + add_library_clr(ceefgen STATIC ${CEEFILEGEN_SOURCES} diff --git a/src/md/compiler/CMakeLists.txt b/src/md/compiler/CMakeLists.txt index 4d99d11..5000f1b 100644 --- a/src/md/compiler/CMakeLists.txt +++ b/src/md/compiler/CMakeLists.txt @@ -20,7 +20,36 @@ set(MDCOMPILER_SOURCES verifylayouts.cpp ) +set(MDCOMPILER_HEADERS + ../../inc/corhdr.h + ../../inc/corpriv.h + ../../inc/mdcommon.h + ../../inc/metadata.h + ../../inc/posterror.h + ../../inc/strongname.h + ../../inc/sstring.h + ../../inc/switches.h + ../inc/cahlprinternal.h + ../inc/mdlog.h + ../inc/metamodelrw.h + ../inc/rwutil.h + ../inc/stgio.h + ../inc/verifylayouts.h + ../inc/VerifyLayouts.h + cacheload.h + classfactory.h + custattr.h + disp.h + filtermanager.h + importhelper.h + mdperf.h + mdsighelper.h + mdutil.h + regmeta.h +) + convert_to_absolute_path(MDCOMPILER_SOURCES ${MDCOMPILER_SOURCES}) +convert_to_absolute_path(MDCOMPILER_HEADERS ${MDCOMPILER_HEADERS}) if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) diff --git a/src/md/compiler/crossgen/CMakeLists.txt b/src/md/compiler/crossgen/CMakeLists.txt index 7baf174..e732ef6 100644 --- a/src/md/compiler/crossgen/CMakeLists.txt +++ b/src/md/compiler/crossgen/CMakeLists.txt @@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) + +if (WIN32) + list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS}) +endif (WIN32) + add_library_clr(mdcompiler_crossgen ${MDCOMPILER_SOURCES}) diff --git a/src/md/compiler/dac/CMakeLists.txt b/src/md/compiler/dac/CMakeLists.txt index dda76e1..80041f3 100644 --- a/src/md/compiler/dac/CMakeLists.txt +++ b/src/md/compiler/dac/CMakeLists.txt @@ -3,4 +3,9 @@ include(${CLR_DIR}/dac.cmake) include(../../md_dac.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) + +if (WIN32) + list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS}) +endif (WIN32) + add_library_clr(mdcompiler_dac ${MDCOMPILER_SOURCES}) diff --git a/src/md/compiler/dbi/CMakeLists.txt b/src/md/compiler/dbi/CMakeLists.txt index b870984..ee7a2cb 100644 --- a/src/md/compiler/dbi/CMakeLists.txt +++ b/src/md/compiler/dbi/CMakeLists.txt @@ -1,4 +1,9 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) -add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES}) \ No newline at end of file + +if (WIN32) + list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS}) +endif (WIN32) + +add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES}) diff --git a/src/md/compiler/wks/CMakeLists.txt b/src/md/compiler/wks/CMakeLists.txt index eb39ca7..c4cf62e 100644 --- a/src/md/compiler/wks/CMakeLists.txt +++ b/src/md/compiler/wks/CMakeLists.txt @@ -3,4 +3,9 @@ include(../../md_wks.cmake) add_definitions(-DFEATURE_METADATA_EMIT_ALL) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) + +if (WIN32) + list(APPEND MDCOMPILER_SOURCES ${MDCOMPILER_HEADERS}) +endif (WIN32) + add_library_clr(mdcompiler_wks ${MDCOMPILER_SOURCES}) diff --git a/src/md/datasource/CMakeLists.txt b/src/md/datasource/CMakeLists.txt index 6657c06..489ef34 100644 --- a/src/md/datasource/CMakeLists.txt +++ b/src/md/datasource/CMakeLists.txt @@ -9,7 +9,15 @@ set(MDDATASOURCE_SOURCES targettypes.cpp ) +set(MDDATASOURCE_HEADERS + ../../inc/cor.h + ../../inc/corpriv.h + datatargetreader.h + remotemdinternalrwsource.h + targettypes.h +) + convert_to_absolute_path(MDDATASOURCE_SOURCES ${MDDATASOURCE_SOURCES}) +convert_to_absolute_path(MDDATASOURCE_HEADERS ${MDDATASOURCE_HEADERS}) add_subdirectory(dbi) - diff --git a/src/md/datasource/dbi/CMakeLists.txt b/src/md/datasource/dbi/CMakeLists.txt index c30c62e..f392a20 100644 --- a/src/md/datasource/dbi/CMakeLists.txt +++ b/src/md/datasource/dbi/CMakeLists.txt @@ -1,4 +1,9 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDDATASOURCE_SOURCES) -add_library_clr(mddatasource_dbi STATIC ${MDDATASOURCE_SOURCES}) \ No newline at end of file + +if (WIN32) + list(APPEND MDDATASOURCE_SOURCES ${MDDATASOURCE_HEADERS}) +endif (WIN32) + +add_library_clr(mddatasource_dbi STATIC ${MDDATASOURCE_SOURCES}) diff --git a/src/md/enc/CMakeLists.txt b/src/md/enc/CMakeLists.txt index 8e388f5..32d640a 100644 --- a/src/md/enc/CMakeLists.txt +++ b/src/md/enc/CMakeLists.txt @@ -10,6 +10,38 @@ set(MDRUNTIMERW_SOURCES mdinternalrw.cpp ) +set(MDRUNTIMERW_HEADERS + ../../inc/corhdr.h + ../../inc/metadata.h + ../../inc/pedecoder.h + ../../inc/pedecoder.inl + ../../inc/posterror.h + ../../inc/sstring.h + ../../inc/sstring.inl + ../compiler/importhelper.h + ../compiler/regmeta.h + ../hotdata/hotdataformat.h + ../inc/liteweightstgdb.h + ../inc/mdfileformat.h + ../inc/mdinternalrw.h + ../inc/mdlog.h + ../inc/metadatahash.h + ../inc/metamodel.h + ../inc/metamodelro.h + ../inc/metamodelrw.h + ../inc/rwutil.h + ../inc/stgio.h + ../inc/stgtiggerstorage.h + ../inc/stgtiggerstream.h + ../inc/streamutil.h + ../runtime/mdinternalro.h +) + +if (WIN32) + list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS}) +endif(WIN32) + +convert_to_absolute_path(MDRUNTIMERW_HEADERS ${MDRUNTIMERW_HEADERS}) convert_to_absolute_path(MDRUNTIMERW_SOURCES ${MDRUNTIMERW_SOURCES}) if(CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/md/enc/crossgen/CMakeLists.txt b/src/md/enc/crossgen/CMakeLists.txt index f01451a..86aa432 100644 --- a/src/md/enc/crossgen/CMakeLists.txt +++ b/src/md/enc/crossgen/CMakeLists.txt @@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) + +if (WIN32) + list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS}) +endif (WIN32) + add_library_clr(mdruntimerw_crossgen ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/enc/dac/CMakeLists.txt b/src/md/enc/dac/CMakeLists.txt index 9bef463..c4ba31d 100644 --- a/src/md/enc/dac/CMakeLists.txt +++ b/src/md/enc/dac/CMakeLists.txt @@ -3,4 +3,9 @@ include(${CLR_DIR}/dac.cmake) include(../../md_dac.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) + +if (WIN32) + list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS}) +endif (WIN32) + add_library_clr(mdruntimerw_dac ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/enc/dbi/CMakeLists.txt b/src/md/enc/dbi/CMakeLists.txt index 5be16bc..d591937 100644 --- a/src/md/enc/dbi/CMakeLists.txt +++ b/src/md/enc/dbi/CMakeLists.txt @@ -1,4 +1,9 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) -add_library_clr(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES}) \ No newline at end of file + +if (WIN32) + list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS}) +endif (WIN32) + +add_library_clr(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/enc/wks/CMakeLists.txt b/src/md/enc/wks/CMakeLists.txt index 2c0a2b1..ff4ec93 100644 --- a/src/md/enc/wks/CMakeLists.txt +++ b/src/md/enc/wks/CMakeLists.txt @@ -3,4 +3,9 @@ include(../../md_wks.cmake) add_definitions(-DFEATURE_METADATA_EMIT_ALL) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) + +if (WIN32) + list(APPEND MDRUNTIMERW_SOURCES ${MDRUNTIMERW_HEADERS}) +endif (WIN32) + add_library_clr(mdruntimerw_wks ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/hotdata/CMakeLists.txt b/src/md/hotdata/CMakeLists.txt index 199edaa4..600da6a 100644 --- a/src/md/hotdata/CMakeLists.txt +++ b/src/md/hotdata/CMakeLists.txt @@ -7,6 +7,22 @@ set(MDHOTDATA_SOURCES hotheapwriter.cpp ) +set(MDHOTDATA_HEADERS + ../../inc/metamodelpub.h + ../databuffer.h + ../heaps/export.h + ../inc/streamutil.h + ./export.h + heapindex.h + hotdataformat.h + hotheap.h + hotheapsdirectoryiterator.h + hotheapwriter.h + hotmetadata.h + hottable.h +) + +convert_to_absolute_path(MDHOTDATA_HEADERS ${MDHOTDATA_HEADERS}) convert_to_absolute_path(MDHOTDATA_SOURCES ${MDHOTDATA_SOURCES}) if(CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/md/hotdata/crossgen/CMakeLists.txt b/src/md/hotdata/crossgen/CMakeLists.txt index 7d7738c..4403c2f 100644 --- a/src/md/hotdata/crossgen/CMakeLists.txt +++ b/src/md/hotdata/crossgen/CMakeLists.txt @@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) + +if (WIN32) + list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS}) +endif (WIN32) + add_library_clr(mdhotdata_crossgen ${MDHOTDATA_SOURCES}) diff --git a/src/md/hotdata/dac/CMakeLists.txt b/src/md/hotdata/dac/CMakeLists.txt index 99a3f1d..67b8408 100644 --- a/src/md/hotdata/dac/CMakeLists.txt +++ b/src/md/hotdata/dac/CMakeLists.txt @@ -3,4 +3,8 @@ include(${CLR_DIR}/dac.cmake) add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) +if (WIN32) + list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS}) +endif (WIN32) + add_library_clr(mdhotdata_dac ${MDHOTDATA_SOURCES}) diff --git a/src/md/hotdata/full-staticcrt/CMakeLists.txt b/src/md/hotdata/full-staticcrt/CMakeLists.txt index 8570c4a..d702032 100644 --- a/src/md/hotdata/full-staticcrt/CMakeLists.txt +++ b/src/md/hotdata/full-staticcrt/CMakeLists.txt @@ -1,4 +1,9 @@ add_definitions(-D_CRTIMP=) # static link of crt add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) + +if (WIN32) + list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS}) +endif (WIN32) + add_library_clr(mdhotdata-staticcrt ${MDHOTDATA_SOURCES}) diff --git a/src/md/hotdata/full/CMakeLists.txt b/src/md/hotdata/full/CMakeLists.txt index 26fc6a0..1b97ff3 100644 --- a/src/md/hotdata/full/CMakeLists.txt +++ b/src/md/hotdata/full/CMakeLists.txt @@ -1,3 +1,7 @@ add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) +if (WIN32) + list(APPEND MDHOTDATA_SOURCES ${MDHOTDATA_HEADERS}) +endif (WIN32) + add_library_clr(mdhotdata_full ${MDHOTDATA_SOURCES}) diff --git a/src/md/runtime/CMakeLists.txt b/src/md/runtime/CMakeLists.txt index 96c9b51..1111bdb 100644 --- a/src/md/runtime/CMakeLists.txt +++ b/src/md/runtime/CMakeLists.txt @@ -11,6 +11,34 @@ set(MDRUNTIME_SOURCES mdinternalro.cpp ) +set(MDRUNTIME_HEADERS + ../../inc/caparser.h + ../../inc/cor.h + ../../inc/corhlpr.h + ../../inc/corpriv.h + ../../inc/mdcommon.h + ../../inc/metadatatracker.h + ../../inc/pedecoder.h + ../../inc/posterror.h + ../compiler/regmeta.h + ../hotdata/export.h + ../inc/assemblymdinternaldisp.h + ../inc/liteweightstgdb.h + ../inc/mdcolumndescriptors.h + ../inc/mdfileformat.h + ../inc/metamodel.h + ../inc/metamodelro.h + ../inc/recordpool.h + ../inc/winmdinterfaces.h + metamodelcolumndefs.h + mdinternaldisp.h + mdinternalro.h + metamodel.cpp + metamodelro.cpp + recordpool.cpp +) + +convert_to_absolute_path(MDRUNTIME_HEADERS ${MDRUNTIME_HEADERS}) convert_to_absolute_path(MDRUNTIME_SOURCES ${MDRUNTIME_SOURCES}) if(CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/md/runtime/crossgen/CMakeLists.txt b/src/md/runtime/crossgen/CMakeLists.txt index dfd0f34..e778a86 100644 --- a/src/md/runtime/crossgen/CMakeLists.txt +++ b/src/md/runtime/crossgen/CMakeLists.txt @@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) + +if (WIN32) + list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS}) +endif (WIN32) + add_library_clr(mdruntime_crossgen ${MDRUNTIME_SOURCES}) diff --git a/src/md/runtime/dac/CMakeLists.txt b/src/md/runtime/dac/CMakeLists.txt index 337968e..ba6d4f0 100644 --- a/src/md/runtime/dac/CMakeLists.txt +++ b/src/md/runtime/dac/CMakeLists.txt @@ -4,4 +4,8 @@ include(../../md_dac.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) +if (WIN32) + list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS}) +endif (WIN32) + add_library_clr(mdruntime_dac ${MDRUNTIME_SOURCES}) \ No newline at end of file diff --git a/src/md/runtime/dbi/CMakeLists.txt b/src/md/runtime/dbi/CMakeLists.txt index 6f706d2..4d2ebe4 100644 --- a/src/md/runtime/dbi/CMakeLists.txt +++ b/src/md/runtime/dbi/CMakeLists.txt @@ -1,3 +1,9 @@ include(../../md_dbi.cmake) + add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) -add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES}) \ No newline at end of file + +if (WIN32) + list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS}) +endif (WIN32) + +add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES}) diff --git a/src/md/runtime/wks/CMakeLists.txt b/src/md/runtime/wks/CMakeLists.txt index 3e2a8cc..c8c52f5 100644 --- a/src/md/runtime/wks/CMakeLists.txt +++ b/src/md/runtime/wks/CMakeLists.txt @@ -3,5 +3,9 @@ include(../../md_wks.cmake) add_definitions(-DFEATURE_METADATA_EMIT_ALL) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) -add_library_clr(mdruntime_wks ${MDRUNTIME_SOURCES}) +if (WIN32) + list(APPEND MDRUNTIME_SOURCES ${MDRUNTIME_HEADERS}) +endif (WIN32) + +add_library_clr(mdruntime_wks ${MDRUNTIME_SOURCES}) diff --git a/src/md/winmd/CMakeLists.txt b/src/md/winmd/CMakeLists.txt index 9fb7d83..31dbbbf 100644 --- a/src/md/winmd/CMakeLists.txt +++ b/src/md/winmd/CMakeLists.txt @@ -4,6 +4,20 @@ set(MDWINMD_SOURCES winmdinternalimportro.cpp ) +set(MDWINMD_HEADERS + ../../inc/cor.h + ../../inc/corpriv.h + ../../inc/metadataexports.h + ../../inc/nsutilpriv.h + ../../inc/sigbuilder.h + ../../inc/sigparser.h + ../../inc/utsem.h + ../inc/winmdinterfaces.h + inc/adapter.h + inc/memotable.h +) + +convert_to_absolute_path(MDWINMD_HEADERS ${MDWINMD_HEADERS}) convert_to_absolute_path(MDWINMD_SOURCES ${MDWINMD_SOURCES}) if(CLR_CMAKE_PLATFORM_UNIX) diff --git a/src/md/winmd/crossgen/CMakeLists.txt b/src/md/winmd/crossgen/CMakeLists.txt index 30859c3..670514a 100644 --- a/src/md/winmd/crossgen/CMakeLists.txt +++ b/src/md/winmd/crossgen/CMakeLists.txt @@ -2,4 +2,9 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) + +if (WIN32) + list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS}) +endif (WIN32) + add_library_clr(mdwinmd_crossgen ${MDWINMD_SOURCES}) diff --git a/src/md/winmd/dac/CMakeLists.txt b/src/md/winmd/dac/CMakeLists.txt index aca5cb5..1ed4aec 100644 --- a/src/md/winmd/dac/CMakeLists.txt +++ b/src/md/winmd/dac/CMakeLists.txt @@ -3,4 +3,9 @@ include(${CLR_DIR}/dac.cmake) include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) + +if (WIN32) + list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS}) +endif (WIN32) + add_library_clr(mdwinmd_dac ${MDWINMD_SOURCES}) diff --git a/src/md/winmd/dbi/CMakeLists.txt b/src/md/winmd/dbi/CMakeLists.txt index 89a39d3..669018e 100644 --- a/src/md/winmd/dbi/CMakeLists.txt +++ b/src/md/winmd/dbi/CMakeLists.txt @@ -1,4 +1,9 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) -add_library_clr(mdwinmd_dbi ${MDWINMD_SOURCES}) \ No newline at end of file + +if (WIN32) + list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS}) +endif (WIN32) + +add_library_clr(mdwinmd_dbi ${MDWINMD_SOURCES}) diff --git a/src/md/winmd/wks/CMakeLists.txt b/src/md/winmd/wks/CMakeLists.txt index defcc1d..930dbca 100644 --- a/src/md/winmd/wks/CMakeLists.txt +++ b/src/md/winmd/wks/CMakeLists.txt @@ -3,4 +3,9 @@ include(../../md_wks.cmake) add_definitions(-DFEATURE_METADATA_EMIT_ALL) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) + +if (WIN32) + list(APPEND MDWINMD_SOURCES ${MDWINMD_HEADERS}) +endif (WIN32) + add_library_clr(mdwinmd_wks ${MDWINMD_SOURCES}) -- 2.7.4