summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2018-09-06 10:13:14 -0700
committerGitHub <noreply@github.com>2018-09-06 10:13:14 -0700
commit102d254eb8195c69875e6d629d47da83b3b51568 (patch)
tree1081d1714e4dda92161e9ba98611d6381abffab8
parenta9f67da092cfc81e7e82269666278a5463543c28 (diff)
parentbec7ee2cbce1673eb2081ba18fb22b10df3cb598 (diff)
Merge pull request #265 from compnerd/upstream-windows-cross-compile
build: only attempt to install MSVC system libraries on Windows
-rw-r--r--src/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 995a9df..468b0f0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -128,11 +128,13 @@ if (MSVC)
APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO)
endif(MSVC)
-set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+if(NOT MSVC OR CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
+ set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
+ include(InstallRequiredSystemLibraries)
+endif()
set(libdir lib${LIB_SUFFIX})
-include (InstallRequiredSystemLibraries)
install(TARGETS ${PROGRAM} ${CMARK_INSTALL}
EXPORT cmark
RUNTIME DESTINATION bin