diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-05-19 13:06:01 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-05-19 13:06:01 (GMT) |
| commit | 0641c59dd1de9541f9650a58739ff1a7f39fece7 (patch) | |
| tree | 93b4daf254fe63763e9b03a79c095c14b513a8dd | |
| parent | 5de792adc6796b0f03d62124765b4af0676dde46 (diff) | |
| download | uscxml-0641c59dd1de9541f9650a58739ff1a7f39fece7.zip uscxml-0641c59dd1de9541f9650a58739ff1a7f39fece7.tar.gz uscxml-0641c59dd1de9541f9650a58739ff1a7f39fece7.tar.bz2 | |
Documentation is installed in correct path
| -rw-r--r-- | TODO.txt | 3 | ||||
| -rw-r--r-- | contrib/cmake/CPackUSCXML.cmake | 10 | ||||
| -rw-r--r-- | docs/BUILDING.md | 6 | ||||
| -rw-r--r-- | docs/CMakeLists.txt | 2 |
4 files changed, 11 insertions, 10 deletions
@@ -1,9 +1,6 @@ -Doxygen C# / Java Bindings Plugins VHDL Transformer -Installer HTTPS respond element Arraybuffers -No third-party dependencies in headers (run_header_compiles)
\ No newline at end of file diff --git a/contrib/cmake/CPackUSCXML.cmake b/contrib/cmake/CPackUSCXML.cmake index 0f850f4..2a6f88b 100644 --- a/contrib/cmake/CPackUSCXML.cmake +++ b/contrib/cmake/CPackUSCXML.cmake @@ -18,7 +18,7 @@ file(GLOB_RECURSE PLATFORM_LIBS # sort host-native libraries into installation components foreach(PLATFORM_LIB ${PLATFORM_LIBS}) -# message("PLATFORM_LIB: ${PLATFORM_LIB}") + # message("PLATFORM_LIB: ${PLATFORM_LIB}") install(FILES ${PLATFORM_LIB} DESTINATION lib COMPONENT library) list (APPEND USCXML_CPACK_COMPONENTS "library") endforeach() @@ -33,6 +33,12 @@ file(GLOB_RECURSE USCXML_HEADERS ${CMAKE_BINARY_DIR}/uscxml/) INSTALL_HEADERS(HEADERS ${USCXML_HEADERS} COMPONENT headers) +list (APPEND USCXML_CPACK_COMPONENTS "headers") + +# foreach(USCXML_HEADER ${USCXML_HEADERS}) +# message("USCXML_HEADER: ${USCXML_HEADER}") +# endforeach() + ######################################## @@ -62,8 +68,6 @@ endif() # endforeach() -list (APPEND USCXML_CPACK_COMPONENTS "headers") - if (NOT CMAKE_CROSS_COMPILING) list (APPEND USCXML_CPACK_COMPONENTS "tools") endif() diff --git a/docs/BUILDING.md b/docs/BUILDING.md index fe2a532..cf504c3 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -4,9 +4,9 @@ [TOC] -@brief This page describes how to build uSCXML from source, starting with either a git checkout or from a downloaded archive. -The source code is built using CMake, the process of building uscxml is -essentially the same on every platform: +This page describes how to build uSCXML from source, starting with either a git +checkout or from a downloaded archive. The source code is built using CMake, +the process of building uscxml is essentially the same on every platform. 1. Read the <b>[Platform Notes](#platform-notes)</b> below to prepare your system. 2. Checkout uscxml into a convenient directory. diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 50d6625..d819a7d 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -18,5 +18,5 @@ if(BUILD_DOCS) COMMENT "Generating API documentation with Doxygen" VERBATIM) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/uscxml) endif() |