From 16e7ab562a0704e2fe176852cce105f88da43914 Mon Sep 17 00:00:00 2001 From: Chris Foster Date: Thu, 12 Sep 2013 21:24:38 +1000 Subject: [PATCH 1/2] Fix broken install when doxygen is not found --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b37b3ed..ec1834b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,10 +101,12 @@ set(DOC_INSTALL_TARGET "share/doc/${PROJECT_NAME}/api" CACHE STRING "Target wher add_dependencies(${LIB_NAME} doc) install(FILES nabo/nabo.h DESTINATION include/nabo) install(FILES README.md DESTINATION share/doc/${PROJECT_NAME}) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${DOC_INSTALL_TARGET}) +if (DOXYGEN_FOUND) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${DOC_INSTALL_TARGET}) +endif() enable_testing() add_subdirectory(examples) add_subdirectory(tests) -add_subdirectory(python) \ No newline at end of file +add_subdirectory(python) From bd5876c24daa9bc7990313afb279bbc3c243a7e1 Mon Sep 17 00:00:00 2001 From: Chris Foster Date: Thu, 12 Sep 2013 22:25:02 +1000 Subject: [PATCH 2/2] Fix cmake stylistic issue --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec1834b..3ea0739 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,7 +103,7 @@ install(FILES nabo/nabo.h DESTINATION include/nabo) install(FILES README.md DESTINATION share/doc/${PROJECT_NAME}) if (DOXYGEN_FOUND) install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${DOC_INSTALL_TARGET}) -endif() +endif(DOXYGEN_FOUND) enable_testing()