cmake: fix install rules

* don't install cmake test binaries
* fix variable names in Doxyfile.in
* install doc files
This commit is contained in:
Alexandre Bouvier 2022-09-16 00:22:02 +02:00 committed by Matthew Gregan
parent 4783607ecc
commit 06aa271e5b
2 changed files with 3 additions and 4 deletions

View file

@ -371,6 +371,7 @@ if(DOXYGEN_FOUND)
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docs/Doxyfile ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/docs/Doxyfile
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs
COMMENT "Generating API documentation with Doxygen" VERBATIM) COMMENT "Generating API documentation with Doxygen" VERBATIM)
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs/html/ TYPE DOC)
endif() endif()
if(BUILD_TESTS) if(BUILD_TESTS)
@ -382,7 +383,6 @@ if(BUILD_TESTS)
target_link_libraries(test_${NAME} PRIVATE cubeb gtest_main) target_link_libraries(test_${NAME} PRIVATE cubeb gtest_main)
add_test(${NAME} test_${NAME} --gtest_death_test_style=threadsafe) add_test(${NAME} test_${NAME} --gtest_death_test_style=threadsafe)
add_sanitizers(test_${NAME}) add_sanitizers(test_${NAME})
install(TARGETS test_${NAME})
endmacro(cubeb_add_test) endmacro(cubeb_add_test)
cubeb_add_test(sanity) cubeb_add_test(sanity)
@ -397,7 +397,6 @@ if(BUILD_TESTS)
target_link_libraries(test_resampler PRIVATE cubeb gtest_main speex) target_link_libraries(test_resampler PRIVATE cubeb gtest_main speex)
add_test(resampler test_resampler) add_test(resampler test_resampler)
add_sanitizers(test_resampler) add_sanitizers(test_resampler)
install(TARGETS test_resampler)
cubeb_add_test(duplex) cubeb_add_test(duplex)

View file

@ -1,5 +1,5 @@
PROJECT_NAME = @PACKAGE@ PROJECT_NAME = @PROJECT_NAME@
PROJECT_NUMBER = @VERSION@ PROJECT_NUMBER = @PROJECT_VERSION@
OUTPUT_DIRECTORY = . OUTPUT_DIRECTORY = .
JAVADOC_AUTOBRIEF = YES JAVADOC_AUTOBRIEF = YES
OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_FOR_C = YES