Compare commits

..

No commits in common. "ffa62626701c20ac850346590a5aa94c9e40db81" and "baa57922b4dd9b6c27c01dedb316c8c2df8a906e" have entirely different histories.

3 changed files with 16 additions and 22 deletions

View File

@ -18,7 +18,6 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
endmacro() endmacro()
macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag) macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_REQUIRED_QUIET TRUE) set(CMAKE_REQUIRED_QUIET TRUE)
check_cxx_compiler_flag("${flag}" CHECK_CXX_FLAG_DEBUG) check_cxx_compiler_flag("${flag}" CHECK_CXX_FLAG_DEBUG)
unset(CMAKE_REQUIRED_QUIET) unset(CMAKE_REQUIRED_QUIET)
@ -31,7 +30,6 @@ macro(CHECK_ENABLE_DEBUG_CXX_FLAG flag)
endif() endif()
# NOTE: check_cxx_compiler stores variables in the cache. # NOTE: check_cxx_compiler stores variables in the cache.
unset(CHECK_CXX_FLAG_DEBUG CACHE) unset(CHECK_CXX_FLAG_DEBUG CACHE)
endif()
endmacro() endmacro()
function(cmlib_set_cxx_standard version) function(cmlib_set_cxx_standard version)

View File

@ -68,10 +68,8 @@ function(add_breathe_target target)
${RST_FILES} ${WORK_DIR}) ${RST_FILES} ${WORK_DIR})
endif() endif()
endif() endif()
install( install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/
DIRECTORY ${CMAKE_BINARY_DIR}/doc/breathe/ COMPONENT doc OPTIONAL
COMPONENT doc
OPTIONAL
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe) DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/breathe)
else() else()
message(STATUS "CMLIB warning:") message(STATUS "CMLIB warning:")

View File

@ -35,10 +35,8 @@ function(add_doxygen_target target)
COMMAND ${DOXYGEN_EXECUTABLE} ${work_dir}/Doxyfile COMMAND ${DOXYGEN_EXECUTABLE} ${work_dir}/Doxyfile
WORKING_DIRECTORY ${work_dir} WORKING_DIRECTORY ${work_dir}
COMMENT "Generating API documentation with Doxygen") COMMENT "Generating API documentation with Doxygen")
install( install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/
DIRECTORY ${CMAKE_BINARY_DIR}/doc/doxygen/html/ COMPONENT doc OPTIONAL
COMPONENT doc
OPTIONAL
DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen) DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/doxygen)
else() else()
message(STATUS "CMLIB warning:") message(STATUS "CMLIB warning:")