From 72a80f017ead336ee7b128f8369a9ba4b57c8b89 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 5 Feb 2015 14:42:03 -0800
Subject: Enable PDB generation for corerun and coreconsole

Corerun and coreconsole are exes, so they don't share the same linker flags as the shared libraries.  Set DEBUG on the EXE flags so that Release always gets debug info.

Don't pass incremental linking, incompatible with debug type
---
 src/coreclr/hosts/coreconsole/CMakeLists.txt | 2 +-
 src/coreclr/hosts/corerun/CMakeLists.txt     | 2 +-
 src/dlls/clretwrc/CMakeLists.txt             | 3 +++
 src/dlls/mscorrc/full/CMakeLists.txt         | 4 ++++
 src/dlls/mscorrc/small/CMakeLists.txt        | 6 +++++-
 5 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/coreclr/hosts/coreconsole/CMakeLists.txt b/src/coreclr/hosts/coreconsole/CMakeLists.txt
index 0054727edb..00b6391f30 100644
--- a/src/coreclr/hosts/coreconsole/CMakeLists.txt
+++ b/src/coreclr/hosts/coreconsole/CMakeLists.txt
@@ -29,6 +29,6 @@ else(CLR_CMAKE_PLATFORM_UNIX)
     # Can't compile on linux yet so only add for windows
     # add the install targets
     install (TARGETS CoreConsole DESTINATION .)
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$ENV{__BuildType}/CoreConsole.pdb DESTINATION PDB CONFIGURATIONS Debug)
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$ENV{__BuildType}/CoreConsole.pdb DESTINATION PDB)
 
 endif(CLR_CMAKE_PLATFORM_UNIX)
\ No newline at end of file
diff --git a/src/coreclr/hosts/corerun/CMakeLists.txt b/src/coreclr/hosts/corerun/CMakeLists.txt
index a799f2f83d..44426106ac 100644
--- a/src/coreclr/hosts/corerun/CMakeLists.txt
+++ b/src/coreclr/hosts/corerun/CMakeLists.txt
@@ -31,6 +31,6 @@ else(CLR_CMAKE_PLATFORM_UNIX)
     install (TARGETS CoreRun DESTINATION .)
     
     # We will generate PDB only for the debug configuration
-    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/CoreRun.pdb DESTINATION PDB CONFIGURATIONS Debug)
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/CoreRun.pdb DESTINATION PDB)
 
 endif(CLR_CMAKE_PLATFORM_UNIX)
\ No newline at end of file
diff --git a/src/dlls/clretwrc/CMakeLists.txt b/src/dlls/clretwrc/CMakeLists.txt
index 5435a7fcd9..91c95c3adb 100644
--- a/src/dlls/clretwrc/CMakeLists.txt
+++ b/src/dlls/clretwrc/CMakeLists.txt
@@ -19,3 +19,6 @@ add_custom_command(
 # add the install targets
 install (TARGETS clretwrc DESTINATION .)
 
+if(WIN32)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/clretwrc.pdb DESTINATION PDB)
+endif(WIN32)
diff --git a/src/dlls/mscorrc/full/CMakeLists.txt b/src/dlls/mscorrc/full/CMakeLists.txt
index 2f7b0ae236..ae3332b2ac 100644
--- a/src/dlls/mscorrc/full/CMakeLists.txt
+++ b/src/dlls/mscorrc/full/CMakeLists.txt
@@ -6,3 +6,7 @@ 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}/$<CONFIG>/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 39cd975b85..b36c811873 100644
--- a/src/dlls/mscorrc/small/CMakeLists.txt
+++ b/src/dlls/mscorrc/small/CMakeLists.txt
@@ -5,4 +5,8 @@ add_library(mscorrc SHARED
 add_definitions(-DFX_VER_INTERNALNAME_STR=mscorrc.dll)
 
 # add the install targets
-install (TARGETS mscorrc DESTINATION .)
\ No newline at end of file
+install (TARGETS mscorrc DESTINATION .)
+
+if(WIN32)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscorrc.pdb DESTINATION PDB)
+endif(WIN32)
\ No newline at end of file
-- 
cgit v1.2.3