diff options
| author | Kevron Rees <kevron.m.rees@intel.com> | 2014-12-24 18:22:50 -0800 |
|---|---|---|
| committer | Kevron Rees <kevron.m.rees@intel.com> | 2014-12-24 18:22:50 -0800 |
| commit | 5507408d3d2481ad78a1d5eb64b80bbadffb3fdf (patch) | |
| tree | b9179bdc64721db78eb07addab7d17e12b230838 | |
| parent | 7f8240f076e451b52597b9f46eda46c5151fb366 (diff) | |
| download | automotive-message-broker-5507408d3d2481ad78a1d5eb64b80bbadffb3fdf.tar.gz | |
fix build issue with bluemonkey docs
| -rw-r--r-- | plugins/bluemonkey/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 5 |
2 files changed, 20 insertions, 16 deletions
diff --git a/plugins/bluemonkey/CMakeLists.txt b/plugins/bluemonkey/CMakeLists.txt index 7fe7b8c2..ec6962a6 100644 --- a/plugins/bluemonkey/CMakeLists.txt +++ b/plugins/bluemonkey/CMakeLists.txt @@ -57,24 +57,27 @@ install (FILES ${config_files} DESTINATION /etc/ambd/bluemonkey) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/README ${CMAKE_CURRENT_BINARY_DIR}/bluemonkey.README @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bluemonkey.in.idl ${CMAKE_CURRENT_BINARY_DIR}/docs/bluemonkey.idl @ONLY) -set(bluemonkey_docs ${CMAKE_CURRENT_BINARY_DIR}/bluemonkey.README ${CMAKE_CURRENT_BINARY_DIR}/docs/bluemonkey.idl) +set(bluemonkey_doc_files ${CMAKE_CURRENT_BINARY_DIR}/bluemonkey.README ${CMAKE_CURRENT_BINARY_DIR}/docs/bluemonkey.idl) if(enable_docs) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) - add_custom_target(bluemonkey_docs ALL ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMENT "Generating Bluemonkey javascript API documentation with Doxygen" VERBATIM) - - #generate mappings documentation - add_custom_target(genmappings_bluemonkey - python ${CMAKE_SOURCE_DIR}/tools/genmapping --output ${CMAKE_CURRENT_BINARY_DIR}/docs/ambdbusmappings.idl ${dbus_mapping_headers} - COMMENT "running genmapping") - add_dependencies(bluemonkey_docs genmappings_bluemonkey) - - install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/html DESTINATION ${DOC_INSTALL_DIR}/plugins/bluemonkey COMPONENT Docs) - install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/latex DESTINATION ${DOC_INSTALL_DIR}/plugins/bluemonkey COMPONENT Docs) + find_package(Doxygen) + if(DOXYGEN_FOUND) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) + add_custom_target(bluemonkey_docs ALL ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "Generating Bluemonkey javascript API documentation with Doxygen" VERBATIM) + + #generate mappings documentation + add_custom_target(genmappings_bluemonkey + python ${CMAKE_SOURCE_DIR}/tools/genmapping --output ${CMAKE_CURRENT_BINARY_DIR}/docs/ambdbusmappings.idl ${dbus_mapping_headers} + COMMENT "running genmapping") + add_dependencies(bluemonkey_docs genmappings_bluemonkey) + + install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/html DESTINATION ${DOC_INSTALL_DIR}/plugins/bluemonkey COMPONENT Docs) + install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/latex DESTINATION ${DOC_INSTALL_DIR}/plugins/bluemonkey COMPONENT Docs) + endif(DOXYGEN_FOUND) endif(enable_docs) -install (FILES ${bluemonkey_docs} DESTINATION ${DOC_INSTALL_DIR}/plugins) +install (FILES ${bluemonkey_doc_files} DESTINATION ${DOC_INSTALL_DIR}/plugins) endif(bluemonkey_plugin) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8fab3da2..36d50cf8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,11 +1,12 @@ set(amb_tests ${CMAKE_CURRENT_BINARY_DIR}/amb-get ${CMAKE_CURRENT_BINARY_DIR}/amb-set - ${CMAKE_CURRENT_BINARY_DIR}/amb-get-history ${CMAKE_CURRENT_BINARY_DIR}/amb-listen - ${CMAKE_CURRENT_BINARY_DIR}/gen-set) + ${CMAKE_CURRENT_BINARY_DIR}/amb-get-history ${CMAKE_CURRENT_BINARY_DIR}/amb-listen + ${CMAKE_CURRENT_BINARY_DIR}/gen-set) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/amb-get.py ${CMAKE_CURRENT_BINARY_DIR}/amb-get @ONLY) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/amb-set.py ${CMAKE_CURRENT_BINARY_DIR}/amb-set @ONLY) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/amb-get-history.py ${CMAKE_CURRENT_BINARY_DIR}/amb-get-history @ONLY) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/amb-listen.py ${CMAKE_CURRENT_BINARY_DIR}/amb-listen @ONLY) +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gen-set.py ${CMAKE_CURRENT_SOURCE_DIR}/gen-set @ONLY) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gendb.sh ${CMAKE_CURRENT_SOURCE_DIR}/gendb @ONLY) install (PROGRAMS ${amb_tests} DESTINATION bin) |