diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2016-01-19 19:24:23 +0100 |
|---|---|---|
| committer | Rama Krishnan Raghupathy <ramarag@microsoft.com> | 2016-01-21 14:39:01 -0800 |
| commit | 2c25d6ca44e3129ace57f6383260a42023a6d646 (patch) | |
| tree | a6132b98d4c43b788eb8bdf34794e97d84bd724a /src/md | |
| parent | aae412433d6235b0a1c5f8f0301b2cc066857cc6 (diff) | |
| download | coreclr-2c25d6ca44e3129ace57f6383260a42023a6d646.tar.gz coreclr-2c25d6ca44e3129ace57f6383260a42023a6d646.tar.bz2 coreclr-2c25d6ca44e3129ace57f6383260a42023a6d646.zip | |
FIx the incremental build for Windows
Conflicts:
build.cmd
src/dlls/clretwrc/CMakeLists.txt
Cleanup
Diffstat (limited to 'src/md')
22 files changed, 22 insertions, 22 deletions
diff --git a/src/md/ceefilegen/CMakeLists.txt b/src/md/ceefilegen/CMakeLists.txt index 146c6a02c3..a1b9107caf 100644 --- a/src/md/ceefilegen/CMakeLists.txt +++ b/src/md/ceefilegen/CMakeLists.txt @@ -17,7 +17,7 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_precompiled_header(stdafx.h stdafx.cpp CEEFILEGEN_SOURCES) -add_library(ceefgen +add_library_clr(ceefgen STATIC ${CEEFILEGEN_SOURCES} ) diff --git a/src/md/compiler/crossgen/CMakeLists.txt b/src/md/compiler/crossgen/CMakeLists.txt index 8a23065335..7baf17448b 100644 --- a/src/md/compiler/crossgen/CMakeLists.txt +++ b/src/md/compiler/crossgen/CMakeLists.txt @@ -2,4 +2,4 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) -add_library(mdcompiler_crossgen ${MDCOMPILER_SOURCES}) +add_library_clr(mdcompiler_crossgen ${MDCOMPILER_SOURCES}) diff --git a/src/md/compiler/dac/CMakeLists.txt b/src/md/compiler/dac/CMakeLists.txt index a73f7b0459..dda76e1cd9 100644 --- a/src/md/compiler/dac/CMakeLists.txt +++ b/src/md/compiler/dac/CMakeLists.txt @@ -3,4 +3,4 @@ include(${CLR_DIR}/dac.cmake) include(../../md_dac.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) -add_library(mdcompiler_dac ${MDCOMPILER_SOURCES}) +add_library_clr(mdcompiler_dac ${MDCOMPILER_SOURCES}) diff --git a/src/md/compiler/dbi/CMakeLists.txt b/src/md/compiler/dbi/CMakeLists.txt index e60d67767b..b870984309 100644 --- a/src/md/compiler/dbi/CMakeLists.txt +++ b/src/md/compiler/dbi/CMakeLists.txt @@ -1,4 +1,4 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) -add_library(mdcompiler-dbi ${MDCOMPILER_SOURCES})
\ No newline at end of file +add_library_clr(mdcompiler-dbi ${MDCOMPILER_SOURCES})
\ No newline at end of file diff --git a/src/md/compiler/wks/CMakeLists.txt b/src/md/compiler/wks/CMakeLists.txt index 7eb09e7524..6bf6c80868 100644 --- a/src/md/compiler/wks/CMakeLists.txt +++ b/src/md/compiler/wks/CMakeLists.txt @@ -1,4 +1,4 @@ include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) -add_library(mdcompiler_wks ${MDCOMPILER_SOURCES})
\ No newline at end of file +add_library_clr(mdcompiler_wks ${MDCOMPILER_SOURCES})
\ No newline at end of file diff --git a/src/md/datasource/dbi/CMakeLists.txt b/src/md/datasource/dbi/CMakeLists.txt index c509c19410..c30c62e33c 100644 --- a/src/md/datasource/dbi/CMakeLists.txt +++ b/src/md/datasource/dbi/CMakeLists.txt @@ -1,4 +1,4 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDDATASOURCE_SOURCES) -add_library(mddatasource_dbi STATIC ${MDDATASOURCE_SOURCES})
\ No newline at end of file +add_library_clr(mddatasource_dbi STATIC ${MDDATASOURCE_SOURCES})
\ No newline at end of file diff --git a/src/md/enc/crossgen/CMakeLists.txt b/src/md/enc/crossgen/CMakeLists.txt index d619c5c3f7..f01451a337 100644 --- a/src/md/enc/crossgen/CMakeLists.txt +++ b/src/md/enc/crossgen/CMakeLists.txt @@ -2,4 +2,4 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) -add_library(mdruntimerw_crossgen ${MDRUNTIMERW_SOURCES}) +add_library_clr(mdruntimerw_crossgen ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/enc/dac/CMakeLists.txt b/src/md/enc/dac/CMakeLists.txt index 90f7e786b6..9bef4636f7 100644 --- a/src/md/enc/dac/CMakeLists.txt +++ b/src/md/enc/dac/CMakeLists.txt @@ -3,4 +3,4 @@ include(${CLR_DIR}/dac.cmake) include(../../md_dac.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) -add_library(mdruntimerw_dac ${MDRUNTIMERW_SOURCES}) +add_library_clr(mdruntimerw_dac ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/enc/dbi/CMakeLists.txt b/src/md/enc/dbi/CMakeLists.txt index 6cd97dd5bd..5be16bc28c 100644 --- a/src/md/enc/dbi/CMakeLists.txt +++ b/src/md/enc/dbi/CMakeLists.txt @@ -1,4 +1,4 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) -add_library(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES})
\ No newline at end of file +add_library_clr(mdruntimerw-dbi ${MDRUNTIMERW_SOURCES})
\ No newline at end of file diff --git a/src/md/enc/wks/CMakeLists.txt b/src/md/enc/wks/CMakeLists.txt index 5b596ed7fa..df7664187d 100644 --- a/src/md/enc/wks/CMakeLists.txt +++ b/src/md/enc/wks/CMakeLists.txt @@ -1,4 +1,4 @@ include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) -add_library(mdruntimerw_wks ${MDRUNTIMERW_SOURCES}) +add_library_clr(mdruntimerw_wks ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/hotdata/crossgen/CMakeLists.txt b/src/md/hotdata/crossgen/CMakeLists.txt index 323edc91e2..7d7738c5c1 100644 --- a/src/md/hotdata/crossgen/CMakeLists.txt +++ b/src/md/hotdata/crossgen/CMakeLists.txt @@ -2,4 +2,4 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) -add_library(mdhotdata_crossgen ${MDHOTDATA_SOURCES}) +add_library_clr(mdhotdata_crossgen ${MDHOTDATA_SOURCES}) diff --git a/src/md/hotdata/dac/CMakeLists.txt b/src/md/hotdata/dac/CMakeLists.txt index 02519679d3..99a3f1d00d 100644 --- a/src/md/hotdata/dac/CMakeLists.txt +++ b/src/md/hotdata/dac/CMakeLists.txt @@ -3,4 +3,4 @@ include(${CLR_DIR}/dac.cmake) add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) -add_library(mdhotdata_dac ${MDHOTDATA_SOURCES}) +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 3d796a23c0..8570c4a6f6 100644 --- a/src/md/hotdata/full-staticcrt/CMakeLists.txt +++ b/src/md/hotdata/full-staticcrt/CMakeLists.txt @@ -1,4 +1,4 @@ add_definitions(-D_CRTIMP=) # static link of crt add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) -add_library(mdhotdata-staticcrt ${MDHOTDATA_SOURCES}) +add_library_clr(mdhotdata-staticcrt ${MDHOTDATA_SOURCES}) diff --git a/src/md/hotdata/full/CMakeLists.txt b/src/md/hotdata/full/CMakeLists.txt index 15448b182a..26fc6a0721 100644 --- a/src/md/hotdata/full/CMakeLists.txt +++ b/src/md/hotdata/full/CMakeLists.txt @@ -1,3 +1,3 @@ add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) -add_library(mdhotdata_full ${MDHOTDATA_SOURCES}) +add_library_clr(mdhotdata_full ${MDHOTDATA_SOURCES}) diff --git a/src/md/runtime/crossgen/CMakeLists.txt b/src/md/runtime/crossgen/CMakeLists.txt index 8ec8e7e4a8..dfd0f34665 100644 --- a/src/md/runtime/crossgen/CMakeLists.txt +++ b/src/md/runtime/crossgen/CMakeLists.txt @@ -2,4 +2,4 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) -add_library(mdruntime_crossgen ${MDRUNTIME_SOURCES}) +add_library_clr(mdruntime_crossgen ${MDRUNTIME_SOURCES}) diff --git a/src/md/runtime/dac/CMakeLists.txt b/src/md/runtime/dac/CMakeLists.txt index 63ce26a1e9..337968e2ed 100644 --- a/src/md/runtime/dac/CMakeLists.txt +++ b/src/md/runtime/dac/CMakeLists.txt @@ -4,4 +4,4 @@ include(../../md_dac.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) -add_library(mdruntime_dac ${MDRUNTIME_SOURCES})
\ No newline at end of file +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 2cc8420c27..6f706d2bfb 100644 --- a/src/md/runtime/dbi/CMakeLists.txt +++ b/src/md/runtime/dbi/CMakeLists.txt @@ -1,3 +1,3 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) -add_library(mdruntime-dbi ${MDRUNTIME_SOURCES})
\ No newline at end of file +add_library_clr(mdruntime-dbi ${MDRUNTIME_SOURCES})
\ No newline at end of file diff --git a/src/md/runtime/wks/CMakeLists.txt b/src/md/runtime/wks/CMakeLists.txt index 4822219c8c..9a1f72ed25 100644 --- a/src/md/runtime/wks/CMakeLists.txt +++ b/src/md/runtime/wks/CMakeLists.txt @@ -1,5 +1,5 @@ include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) -add_library(mdruntime_wks ${MDRUNTIME_SOURCES}) +add_library_clr(mdruntime_wks ${MDRUNTIME_SOURCES}) diff --git a/src/md/winmd/crossgen/CMakeLists.txt b/src/md/winmd/crossgen/CMakeLists.txt index fdf5040757..30859c30ae 100644 --- a/src/md/winmd/crossgen/CMakeLists.txt +++ b/src/md/winmd/crossgen/CMakeLists.txt @@ -2,4 +2,4 @@ include(${CLR_DIR}/crossgen.cmake) include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) -add_library(mdwinmd_crossgen ${MDWINMD_SOURCES}) +add_library_clr(mdwinmd_crossgen ${MDWINMD_SOURCES}) diff --git a/src/md/winmd/dac/CMakeLists.txt b/src/md/winmd/dac/CMakeLists.txt index 31e6bb0deb..aca5cb581d 100644 --- a/src/md/winmd/dac/CMakeLists.txt +++ b/src/md/winmd/dac/CMakeLists.txt @@ -3,4 +3,4 @@ include(${CLR_DIR}/dac.cmake) include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) -add_library(mdwinmd_dac ${MDWINMD_SOURCES}) +add_library_clr(mdwinmd_dac ${MDWINMD_SOURCES}) diff --git a/src/md/winmd/dbi/CMakeLists.txt b/src/md/winmd/dbi/CMakeLists.txt index 707b6b4c74..89a39d3d9b 100644 --- a/src/md/winmd/dbi/CMakeLists.txt +++ b/src/md/winmd/dbi/CMakeLists.txt @@ -1,4 +1,4 @@ include(../../md_dbi.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) -add_library(mdwinmd_dbi ${MDWINMD_SOURCES})
\ No newline at end of file +add_library_clr(mdwinmd_dbi ${MDWINMD_SOURCES})
\ No newline at end of file diff --git a/src/md/winmd/wks/CMakeLists.txt b/src/md/winmd/wks/CMakeLists.txt index 67b1f686f5..139b68b28c 100644 --- a/src/md/winmd/wks/CMakeLists.txt +++ b/src/md/winmd/wks/CMakeLists.txt @@ -1,4 +1,4 @@ include(../../md_wks.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) -add_library(mdwinmd_wks ${MDWINMD_SOURCES})
\ No newline at end of file +add_library_clr(mdwinmd_wks ${MDWINMD_SOURCES})
\ No newline at end of file |