From 10ad17e525b7c5f6432e3c1b0a453d291e5d78b6 Mon Sep 17 00:00:00 2001 From: John Chen Date: Mon, 20 Apr 2015 08:36:31 -0700 Subject: Enable build crossgen.exe from build.cmd. Adds and modifies CMakeLists.txt files to enable building of crossgen.exe from build.cmd for x64 processor on Windows. Also adds a step in build.cmd to generate native image for mscorlib. [tfs-changeset: 1456454] --- src/md/compiler/CMakeLists.txt | 3 +++ src/md/compiler/crossgen/CMakeLists.txt | 5 +++++ src/md/enc/CMakeLists.txt | 3 +++ src/md/enc/crossgen/CMakeLists.txt | 5 +++++ src/md/hotdata/CMakeLists.txt | 3 ++- src/md/hotdata/crossgen/CMakeLists.txt | 5 +++++ src/md/runtime/CMakeLists.txt | 3 +++ src/md/runtime/crossgen/CMakeLists.txt | 5 +++++ src/md/winmd/CMakeLists.txt | 3 ++- src/md/winmd/crossgen/CMakeLists.txt | 5 +++++ 10 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 src/md/compiler/crossgen/CMakeLists.txt create mode 100644 src/md/enc/crossgen/CMakeLists.txt create mode 100644 src/md/hotdata/crossgen/CMakeLists.txt create mode 100644 src/md/runtime/crossgen/CMakeLists.txt create mode 100644 src/md/winmd/crossgen/CMakeLists.txt (limited to 'src/md') diff --git a/src/md/compiler/CMakeLists.txt b/src/md/compiler/CMakeLists.txt index c2d84f3766..130a8d2d64 100644 --- a/src/md/compiler/CMakeLists.txt +++ b/src/md/compiler/CMakeLists.txt @@ -31,3 +31,6 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(dac) add_subdirectory(wks) add_subdirectory(dbi) +if(WIN32) + add_subdirectory(crossgen) +endif(WIN32) diff --git a/src/md/compiler/crossgen/CMakeLists.txt b/src/md/compiler/crossgen/CMakeLists.txt new file mode 100644 index 0000000000..8a23065335 --- /dev/null +++ b/src/md/compiler/crossgen/CMakeLists.txt @@ -0,0 +1,5 @@ +include(${CLR_DIR}/crossgen.cmake) +include(../../md_wks.cmake) + +add_precompiled_header(stdafx.h ../stdafx.cpp MDCOMPILER_SOURCES) +add_library(mdcompiler_crossgen ${MDCOMPILER_SOURCES}) diff --git a/src/md/enc/CMakeLists.txt b/src/md/enc/CMakeLists.txt index 5eda2db690..8ba256ba30 100644 --- a/src/md/enc/CMakeLists.txt +++ b/src/md/enc/CMakeLists.txt @@ -21,3 +21,6 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(dac) add_subdirectory(wks) add_subdirectory(dbi) +if(WIN32) + add_subdirectory(crossgen) +endif(WIN32) diff --git a/src/md/enc/crossgen/CMakeLists.txt b/src/md/enc/crossgen/CMakeLists.txt new file mode 100644 index 0000000000..d619c5c3f7 --- /dev/null +++ b/src/md/enc/crossgen/CMakeLists.txt @@ -0,0 +1,5 @@ +include(${CLR_DIR}/crossgen.cmake) +include(../../md_wks.cmake) + +add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIMERW_SOURCES) +add_library(mdruntimerw_crossgen ${MDRUNTIMERW_SOURCES}) diff --git a/src/md/hotdata/CMakeLists.txt b/src/md/hotdata/CMakeLists.txt index 8ce023f575..246dc63985 100644 --- a/src/md/hotdata/CMakeLists.txt +++ b/src/md/hotdata/CMakeLists.txt @@ -17,4 +17,5 @@ add_subdirectory(dac) add_subdirectory(full) if(WIN32) add_subdirectory(full-staticcrt) -endif(WIN32) \ No newline at end of file + add_subdirectory(crossgen) +endif(WIN32) diff --git a/src/md/hotdata/crossgen/CMakeLists.txt b/src/md/hotdata/crossgen/CMakeLists.txt new file mode 100644 index 0000000000..323edc91e2 --- /dev/null +++ b/src/md/hotdata/crossgen/CMakeLists.txt @@ -0,0 +1,5 @@ +include(${CLR_DIR}/crossgen.cmake) +include(../../md_wks.cmake) + +add_precompiled_header(external.h ../external.cpp MDHOTDATA_SOURCES) +add_library(mdhotdata_crossgen ${MDHOTDATA_SOURCES}) diff --git a/src/md/runtime/CMakeLists.txt b/src/md/runtime/CMakeLists.txt index ed938707ef..eb25640f36 100644 --- a/src/md/runtime/CMakeLists.txt +++ b/src/md/runtime/CMakeLists.txt @@ -20,3 +20,6 @@ endif(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(dac) add_subdirectory(wks) add_subdirectory(dbi) +if(WIN32) + add_subdirectory(crossgen) +endif(WIN32) diff --git a/src/md/runtime/crossgen/CMakeLists.txt b/src/md/runtime/crossgen/CMakeLists.txt new file mode 100644 index 0000000000..8ec8e7e4a8 --- /dev/null +++ b/src/md/runtime/crossgen/CMakeLists.txt @@ -0,0 +1,5 @@ +include(${CLR_DIR}/crossgen.cmake) +include(../../md_wks.cmake) + +add_precompiled_header(stdafx.h ../stdafx.cpp MDRUNTIME_SOURCES) +add_library(mdruntime_crossgen ${MDRUNTIME_SOURCES}) diff --git a/src/md/winmd/CMakeLists.txt b/src/md/winmd/CMakeLists.txt index d517df0715..540f1e1db7 100644 --- a/src/md/winmd/CMakeLists.txt +++ b/src/md/winmd/CMakeLists.txt @@ -16,4 +16,5 @@ add_subdirectory(dac) add_subdirectory(wks) if(WIN32) add_subdirectory(dbi) -endif(WIN32) \ No newline at end of file + add_subdirectory(crossgen) +endif(WIN32) diff --git a/src/md/winmd/crossgen/CMakeLists.txt b/src/md/winmd/crossgen/CMakeLists.txt new file mode 100644 index 0000000000..fdf5040757 --- /dev/null +++ b/src/md/winmd/crossgen/CMakeLists.txt @@ -0,0 +1,5 @@ +include(${CLR_DIR}/crossgen.cmake) +include(../../md_wks.cmake) + +add_precompiled_header(stdafx.h ../stdafx.cpp MDWINMD_SOURCES) +add_library(mdwinmd_crossgen ${MDWINMD_SOURCES}) -- cgit v1.2.3