summaryrefslogtreecommitdiff
path: root/src/dlls/mscordac
diff options
context:
space:
mode:
authorHadi Brais <hadi.b@live.com>2015-06-08 18:52:23 +0530
committerHadi Brais <hadi.b@live.com>2015-06-08 21:41:48 +0530
commitff56705cf609b2c54bfa36a227b5bf818c050ea3 (patch)
tree73fa10dc2d7c42d23143388e140cfcea8ffe67a2 /src/dlls/mscordac
parent2b6efaeed3b263b3be0be46716205152567e854a (diff)
downloadcoreclr-ff56705cf609b2c54bfa36a227b5bf818c050ea3.tar.gz
coreclr-ff56705cf609b2c54bfa36a227b5bf818c050ea3.tar.bz2
coreclr-ff56705cf609b2c54bfa36a227b5bf818c050ea3.zip
Build, Windows: Use Config instead of Build Type
CMAKE_BUILD_TYPE should not be used with multi-configuration toolsets like Visual Studio. This commit removes the dependence of the Windows build on CMAKE_BUILD_TYPE. See (https://github.com/dotnet/coreclr/pull/1111#commitcomment-11562822).
Diffstat (limited to 'src/dlls/mscordac')
-rw-r--r--src/dlls/mscordac/CMakeLists.txt8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt
index c40c465076..2bc01da646 100644
--- a/src/dlls/mscordac/CMakeLists.txt
+++ b/src/dlls/mscordac/CMakeLists.txt
@@ -68,17 +68,11 @@ if(WIN32)
# mscordac.def should be generated before mscordaccore.dll is built
add_dependencies(mscordaccore mscordaccore_def)
- set(LTCG_FLAG "")
- if (CMAKE_BUILD_TYPE STREQUAL Release OR CMAKE_BUILD_TYPE STREQUAL Relwithdebinfo)
- set(LTCG_FLAG "/LTCG")
- endif()
-
# Generate export file
add_custom_command(TARGET mscordaccore
PRE_LINK
- COMMAND lib.exe ${LTCG_FLAG} /OUT:${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscordaccore.lib /DEF:${CMAKE_CURRENT_BINARY_DIR}/mscordac.def $<TARGET_FILE:daccess> ${STATIC_LIBRARY_FLAGS} ${CMAKE_CURRENT_BINARY_DIR}/mscordaccore.dir/$<CONFIG>/mscordac.obj
+ COMMAND lib.exe /OUT:"${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/mscordaccore.lib" /DEF:"${CMAKE_CURRENT_BINARY_DIR}/mscordac.def" "$<TARGET_FILE:daccess>" $<$<OR:$<CONFIG:Release>,$<CONFIG:Relwithdebinfo>>:/LTCG> ${STATIC_LIBRARY_FLAGS} "${CMAKE_CURRENT_BINARY_DIR}/mscordaccore.dir/$<CONFIG>/mscordac.obj"
COMMENT "Generating mscordaccore.exp export file"
- VERBATIM
)
set(COREDAC_LIBRARIES