From 19f048c615246525f244dacf37835029566cf6af Mon Sep 17 00:00:00 2001 From: theNerd247 Date: Sat, 14 May 2016 17:55:45 -0400 Subject: [PATCH] made installing documentation optional * fixed bug mentioned in #345 about `make install` giving an error when `make doc` isn't called previously --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acef57a..214e7c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,7 +328,7 @@ else() set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp) endif() -file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INCLUDE_INSTALL_ROOT_DIR}") +file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${INCLUDE_INSTALL_ROOT_DIR}") set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY) @@ -374,6 +374,7 @@ install(DIRECTORY "${DOC_DIR}/" DESTINATION "${SHARE_INSTALL_DIR}/doc/yaml-cpp${LIB_SUFFIX}" + OPTIONAL PATTERN "${DOC_DIR}/*" )