diff options
| author | John Chen <jochen@microsoft.com> | 2015-04-20 08:36:31 -0700 |
|---|---|---|
| committer | John Chen <jochen@microsoft.com> | 2015-04-20 08:36:31 -0700 |
| commit | 10ad17e525b7c5f6432e3c1b0a453d291e5d78b6 (patch) | |
| tree | 46315b7efcfd5b6da8382cc0bb5b659c6d3d5d5c /src/gcinfo | |
| parent | 6288f3d99995661184d90d542511ff37905ef299 (diff) | |
| download | coreclr-10ad17e525b7c5f6432e3c1b0a453d291e5d78b6.tar.gz coreclr-10ad17e525b7c5f6432e3c1b0a453d291e5d78b6.tar.bz2 coreclr-10ad17e525b7c5f6432e3c1b0a453d291e5d78b6.zip | |
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]
Diffstat (limited to 'src/gcinfo')
| -rw-r--r-- | src/gcinfo/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/gcinfo/crossgen/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/gcinfo/lib/.gitmirror | 1 | ||||
| -rw-r--r-- | src/gcinfo/lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/gcinfo/lib/GCInfo.nativeproj | 15 |
5 files changed, 32 insertions, 4 deletions
diff --git a/src/gcinfo/CMakeLists.txt b/src/gcinfo/CMakeLists.txt index 528b9223ba..2764b68cf5 100644 --- a/src/gcinfo/CMakeLists.txt +++ b/src/gcinfo/CMakeLists.txt @@ -6,11 +6,13 @@ set( GCINFO_SOURCES dbggcinfoencoder.cpp ) +convert_to_absolute_path(GCINFO_SOURCES ${GCINFO_SOURCES}) + if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) endif(CLR_CMAKE_PLATFORM_UNIX) -add_library(gcinfo - STATIC - ${GCINFO_SOURCES} -) +add_subdirectory(lib) +if(WIN32) + add_subdirectory(crossgen) +endif() diff --git a/src/gcinfo/crossgen/CMakeLists.txt b/src/gcinfo/crossgen/CMakeLists.txt new file mode 100644 index 0000000000..ac04eaadf0 --- /dev/null +++ b/src/gcinfo/crossgen/CMakeLists.txt @@ -0,0 +1,6 @@ +include(${CLR_DIR}/crossgen.cmake) + +add_library(gcinfo_crossgen + STATIC + ${GCINFO_SOURCES} +) diff --git a/src/gcinfo/lib/.gitmirror b/src/gcinfo/lib/.gitmirror new file mode 100644 index 0000000000..f507630f94 --- /dev/null +++ b/src/gcinfo/lib/.gitmirror @@ -0,0 +1 @@ +Only contents of this folder, excluding subfolders, will be mirrored by the Git-TFS Mirror.
\ No newline at end of file diff --git a/src/gcinfo/lib/CMakeLists.txt b/src/gcinfo/lib/CMakeLists.txt new file mode 100644 index 0000000000..7e426ea3b6 --- /dev/null +++ b/src/gcinfo/lib/CMakeLists.txt @@ -0,0 +1,4 @@ +add_library(gcinfo + STATIC + ${GCINFO_SOURCES} +) diff --git a/src/gcinfo/lib/GCInfo.nativeproj b/src/gcinfo/lib/GCInfo.nativeproj new file mode 100644 index 0000000000..cc27db5e91 --- /dev/null +++ b/src/gcinfo/lib/GCInfo.nativeproj @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Label="Globals"> + <SccProjectName>SAK</SccProjectName> + <SccAuxPath>SAK</SccAuxPath> + <SccLocalPath>SAK</SccLocalPath> + <SccProvider>SAK</SccProvider> + </PropertyGroup> + <PropertyGroup> + <BuildCoreBinaries>true</BuildCoreBinaries> + <BuildSysBinaries>true</BuildSysBinaries> + <OutputName>GCInfo</OutputName> + </PropertyGroup> + <Import Project="..\gcinfo.settings.targets" /> +</Project> |