From 06aa271e5bca1a74692c8828ad8585dd9598e092 Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Fri, 16 Sep 2022 00:22:02 +0200 Subject: [PATCH] cmake: fix install rules * don't install cmake test binaries * fix variable names in Doxyfile.in * install doc files --- CMakeLists.txt | 3 +-- docs/Doxyfile.in | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9cfae641b..7ae58d44d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -371,6 +371,7 @@ if(DOXYGEN_FOUND) ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docs/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs COMMENT "Generating API documentation with Doxygen" VERBATIM) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs/html/ TYPE DOC) endif() if(BUILD_TESTS) @@ -382,7 +383,6 @@ if(BUILD_TESTS) target_link_libraries(test_${NAME} PRIVATE cubeb gtest_main) add_test(${NAME} test_${NAME} --gtest_death_test_style=threadsafe) add_sanitizers(test_${NAME}) - install(TARGETS test_${NAME}) endmacro(cubeb_add_test) cubeb_add_test(sanity) @@ -397,7 +397,6 @@ if(BUILD_TESTS) target_link_libraries(test_resampler PRIVATE cubeb gtest_main speex) add_test(resampler test_resampler) add_sanitizers(test_resampler) - install(TARGETS test_resampler) cubeb_add_test(duplex) diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index 2b52bcefc..8ec863be8 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -1,5 +1,5 @@ -PROJECT_NAME = @PACKAGE@ -PROJECT_NUMBER = @VERSION@ +PROJECT_NAME = @PROJECT_NAME@ +PROJECT_NUMBER = @PROJECT_VERSION@ OUTPUT_DIRECTORY = . JAVADOC_AUTOBRIEF = YES OPTIMIZE_OUTPUT_FOR_C = YES