External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made installing documentation optional

Browse Source 
* fixed bug mentioned in #345 about `make install` giving an error
    when `make doc` isn't called previously
This commit is contained in:
theNerd247 2016-05-14 17:55:45 -04:00
parent c60d8596f5
commit 19f048c615
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -328,7 +328,7 @@ else()
set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp) set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp)
endif() 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}") set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY) "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY)
@ -374,6 +374,7 @@ install(DIRECTORY
"${DOC_DIR}/" "${DOC_DIR}/"
DESTINATION DESTINATION
"${SHARE_INSTALL_DIR}/doc/yaml-cpp${LIB_SUFFIX}" "${SHARE_INSTALL_DIR}/doc/yaml-cpp${LIB_SUFFIX}"
OPTIONAL
PATTERN "${DOC_DIR}/*" PATTERN "${DOC_DIR}/*"
) )