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/debug | |
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/debug')
-rw-r--r-- | src/debug/daccess/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/debug/dbgutil/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/debug/di/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/debug/ee/dac/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/debug/ee/wks/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/debug/ildbsymlib/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/debug/shim/CMakeLists.txt | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt index 6b459b89b4..795b9b4be9 100644 --- a/src/debug/daccess/CMakeLists.txt +++ b/src/debug/daccess/CMakeLists.txt @@ -69,7 +69,7 @@ convert_to_absolute_path(DACCESS_SOURCES ${DACCESS_SOURCES}) add_precompiled_header(stdafx.h stdafx.cpp DACCESS_SOURCES) -add_library(daccess ${DACCESS_SOURCES}) +add_library_clr(daccess ${DACCESS_SOURCES}) if(CLR_CMAKE_PLATFORM_UNIX) add_dependencies(daccess coreclr) diff --git a/src/debug/dbgutil/CMakeLists.txt b/src/debug/dbgutil/CMakeLists.txt index b1a69f7d6b..1c0d49a24e 100644 --- a/src/debug/dbgutil/CMakeLists.txt +++ b/src/debug/dbgutil/CMakeLists.txt @@ -13,4 +13,4 @@ if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) endif(CLR_CMAKE_PLATFORM_UNIX) -add_library(dbgutil STATIC ${DBGUTIL_SOURCES}) +add_library_clr(dbgutil STATIC ${DBGUTIL_SOURCES}) diff --git a/src/debug/di/CMakeLists.txt b/src/debug/di/CMakeLists.txt index 925f356a3a..aea0320d34 100644 --- a/src/debug/di/CMakeLists.txt +++ b/src/debug/di/CMakeLists.txt @@ -78,4 +78,4 @@ endif(WIN32) add_precompiled_header(stdafx.h stdafx.cpp CORDBDI_SOURCES) -add_library(cordbdi STATIC ${CORDBDI_SOURCES}) +add_library_clr(cordbdi STATIC ${CORDBDI_SOURCES}) diff --git a/src/debug/ee/dac/CMakeLists.txt b/src/debug/ee/dac/CMakeLists.txt index c60a5f8a08..a65bc07b39 100644 --- a/src/debug/ee/dac/CMakeLists.txt +++ b/src/debug/ee/dac/CMakeLists.txt @@ -3,4 +3,4 @@ include(${CLR_DIR}/dac.cmake) add_precompiled_header(stdafx.h ../stdafx.cpp CORDBEE_SOURCES_DAC) -add_library(cordbee_dac ${CORDBEE_SOURCES_DAC}) +add_library_clr(cordbee_dac ${CORDBEE_SOURCES_DAC}) diff --git a/src/debug/ee/wks/CMakeLists.txt b/src/debug/ee/wks/CMakeLists.txt index 79152ce404..36cb25e9e6 100644 --- a/src/debug/ee/wks/CMakeLists.txt +++ b/src/debug/ee/wks/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dbghelpers.obj if(CLR_CMAKE_PLATFORM_ARCH_ARM64) #mark obj as source that does not require compile set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/dbghelpers.obj PROPERTIES EXTERNAL_OBJECT TRUE) - add_library(cordbee_wks ${CORDBEE_SOURCES_WKS}) + add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS}) else() - add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ${CMAKE_CURRENT_BINARY_DIR}/dbghelpers.obj) + add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS} ${CMAKE_CURRENT_BINARY_DIR}/dbghelpers.obj) endif() else () @@ -29,11 +29,11 @@ else () add_compile_options(-fPIC) if(CLR_CMAKE_PLATFORM_ARCH_AMD64) - add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) + add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - add_library(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) + add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS} ../${ARCH_SOURCES_DIR}/dbghelpers.S) elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - add_library(cordbee_wks ${CORDBEE_SOURCES_WKS}) + add_library_clr(cordbee_wks ${CORDBEE_SOURCES_WKS}) else() message(FATAL_ERROR "Only ARM and AMD64 is supported") endif() diff --git a/src/debug/ildbsymlib/CMakeLists.txt b/src/debug/ildbsymlib/CMakeLists.txt index 848f95f435..1bd1096ed6 100644 --- a/src/debug/ildbsymlib/CMakeLists.txt +++ b/src/debug/ildbsymlib/CMakeLists.txt @@ -14,5 +14,5 @@ if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) endif(CLR_CMAKE_PLATFORM_UNIX) -add_library(ildbsymlib ${ILDBSYMLIB_SOURCES}) +add_library_clr(ildbsymlib ${ILDBSYMLIB_SOURCES}) diff --git a/src/debug/shim/CMakeLists.txt b/src/debug/shim/CMakeLists.txt index 0d7d308f05..8720eb7df2 100644 --- a/src/debug/shim/CMakeLists.txt +++ b/src/debug/shim/CMakeLists.txt @@ -12,4 +12,4 @@ set(DEBUGSHIM_SOURCES debugshim.cpp ) -add_library(debugshim STATIC ${DEBUGSHIM_SOURCES})
\ No newline at end of file +add_library_clr(debugshim STATIC ${DEBUGSHIM_SOURCES})
\ No newline at end of file |