diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a4da122206a..a394fd987e5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,6 +124,10 @@ if(CLR_CMAKE_PLATFORM_UNIX) add_subdirectory(src/coreclr/hosts/unixcorerun) endif(CLR_CMAKE_PLATFORM_UNIX) +# Add this subdir. We install the headers for the jit. + +add_subdirectory(src/pal/prebuilt/inc) + # Set to 1 if you want to clear the CMAKE initial compiler flags and set all the flags explicitly # or to 0 if the CMake generated flags should be used diff --git a/build.proj b/build.proj index e15412c15151..e582c07e859b 100644 --- a/build.proj +++ b/build.proj @@ -44,19 +44,20 @@ - - $(PackagesDir)Microsoft.DotNet.CoreCLR.nuspec - $(PackagesBinDir)\Microsoft.DotNet.CoreCLR.nuspec - - - + + + + + + + - + - + diff --git a/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec b/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec new file mode 100644 index 000000000000..b25135bea701 --- /dev/null +++ b/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec @@ -0,0 +1,41 @@ + + + + Microsoft.DotNet.CoreCLR.Development + 1.0.0-prerelease + Microsoft DotNet CoreCLR Runtime For Component Development + Microsoft + Microsoft + http://go.microsoft.com/fwlink/?LinkId=329770 + https://github.com/dotnet/coreclr + http://go.microsoft.com/fwlink/?LinkID=288859 + true + Provides the CoreCLR runtime binaries with debug information and interface headers + Initial release + Copyright © Microsoft Corporation + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/dlls/clretwrc/CMakeLists.txt b/src/dlls/clretwrc/CMakeLists.txt index 91c95c3adb2e..e43fcb9665ae 100644 --- a/src/dlls/clretwrc/CMakeLists.txt +++ b/src/dlls/clretwrc/CMakeLists.txt @@ -18,7 +18,6 @@ add_custom_command( # add the install targets install (TARGETS clretwrc DESTINATION .) - if(WIN32) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$/clretwrc.pdb DESTINATION PDB) endif(WIN32) diff --git a/src/dlls/mscorrc/full/CMakeLists.txt b/src/dlls/mscorrc/full/CMakeLists.txt index ae3332b2ac5e..75736d7fa882 100644 --- a/src/dlls/mscorrc/full/CMakeLists.txt +++ b/src/dlls/mscorrc/full/CMakeLists.txt @@ -6,7 +6,6 @@ add_definitions(-DFX_VER_INTERNALNAME_STR=mscorrc.debug.dll) # add the install targets install (TARGETS mscorrc.debug DESTINATION .) - if(WIN32) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$/mscorrc.debug.pdb DESTINATION PDB) endif(WIN32) \ No newline at end of file diff --git a/src/dlls/mscorrc/small/CMakeLists.txt b/src/dlls/mscorrc/small/CMakeLists.txt index b36c811873d0..f9cf83419ff6 100644 --- a/src/dlls/mscorrc/small/CMakeLists.txt +++ b/src/dlls/mscorrc/small/CMakeLists.txt @@ -6,7 +6,6 @@ add_definitions(-DFX_VER_INTERNALNAME_STR=mscorrc.dll) # add the install targets install (TARGETS mscorrc DESTINATION .) - if(WIN32) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$/mscorrc.pdb DESTINATION PDB) endif(WIN32) \ No newline at end of file diff --git a/src/inc/CMakeLists.txt b/src/inc/CMakeLists.txt index 66037d2da516..f7988f140e58 100644 --- a/src/inc/CMakeLists.txt +++ b/src/inc/CMakeLists.txt @@ -60,3 +60,7 @@ endif(WIN32) # Compile *_i.c to lib add_library(corguids ${CORGUIDS_SOURCES}) + +# Binplace the inc files for packaging later. + +install (FILES cor.h corhdr.h corinfo.h corjit.h DESTINATION inc) \ No newline at end of file diff --git a/src/pal/prebuilt/inc/CMakeLists.txt b/src/pal/prebuilt/inc/CMakeLists.txt new file mode 100644 index 000000000000..23b869dae333 --- /dev/null +++ b/src/pal/prebuilt/inc/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 2.8.12.2) + +project(COREPAL) + +install (FILES corerror.h DESTINATION inc) +