From 828eeaf8960a347777f34ed134c5211717f1d446 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 22 Dec 2019 10:32:57 -0800 Subject: build: improve man page installation man pages are extremely useful, but are not generally available on Windows. This changes the install condition to check for the Windows cross-compile rather than the toolchain in use. It is possible to build for Windows using clang in the GNU driver. --- CMakeLists.txt | 6 +++++- man/CMakeLists.txt | 11 ++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f375289..d4b8d98 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,11 @@ add_subdirectory(src) if(CMARK_TESTS AND (CMARK_SHARED OR CMARK_STATIC)) add_subdirectory(api_test) endif() -add_subdirectory(man) +# TODO(compnerd) should this be enabled for MinGW, which sets CMAKE_SYSTEM_NAME +# to Windows, but defines `MINGW`. +if(NOT CMAKE_SYSTEM_NAME STREQUAL Windows) + add_subdirectory(man) +endif() if(CMARK_TESTS) enable_testing() add_subdirectory(test testdir) diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 13e8742..8ed5448 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -1,7 +1,4 @@ -if (NOT MSVC) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man1/cmark.1 - DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man3/cmark.3 - DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) -endif(NOT MSVC) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man1/cmark.1 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man3/cmark.3 + DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) -- cgit v1.2.3