[openrtm-commit:03367] r3440 - trunk/OpenRTM-aist/docs

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-11-08 16:07:51 +0900 (Thu, 08 Nov 2018)
New Revision: 3440

Modified:
   trunk/OpenRTM-aist/docs/CMakeLists.txt
   trunk/OpenRTM-aist/docs/doxygen_classref.conf.cmake.in
   trunk/OpenRTM-aist/docs/doxygen_idlref.conf.cmake.in
Log:
[compat, cmake]

Modified: trunk/OpenRTM-aist/docs/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/docs/CMakeLists.txt	2018-11-07 11:14:01 UTC (rev 3439)
+++ trunk/OpenRTM-aist/docs/CMakeLists.txt	2018-11-08 07:07:51 UTC (rev 3440)
@@ -24,7 +24,7 @@
 
 add_custom_command(
 	OUTPUT ClassReference/html/index.html
-	COMMAND doxygen ${PROJECT_SOURCE_DIR}/doxygen_idlref.conf
+	COMMAND doxygen ${PROJECT_SOURCE_DIR}/doxygen_classref.conf
 	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 add_custom_target(ClassReference DEPENDS ClassReference/html/index.html)
@@ -65,10 +65,10 @@
 add_dependencies(${RTM_PROJECT_NAME} ClassReference-en)
 
 
-install(DIRECTORY IDLReference DESTINATION ${INSTALL_RTM_DOC_DIR})
-install(DIRECTORY ClassReference DESTINATION ${INSTALL_RTM_DOC_DIR})
-install(DIRECTORY IDLReference-en DESTINATION ${INSTALL_RTM_DOC_DIR})
-install(DIRECTORY ClassReference-en DESTINATION ${INSTALL_RTM_DOC_DIR})
+install(DIRECTORY IDLReference DESTINATION ${INSTALL_RTM_DOC_DIR}/idl)
+install(DIRECTORY ClassReference DESTINATION ${INSTALL_RTM_DOC_DIR}/c++)
+install(DIRECTORY IDLReference-en DESTINATION ${INSTALL_RTM_DOC_DIR}/idl)
+install(DIRECTORY ClassReference-en DESTINATION ${INSTALL_RTM_DOC_DIR}/c++)
  
 
 

Modified: trunk/OpenRTM-aist/docs/doxygen_classref.conf.cmake.in
===================================================================
--- trunk/OpenRTM-aist/docs/doxygen_classref.conf.cmake.in	2018-11-07 11:14:01 UTC (rev 3439)
+++ trunk/OpenRTM-aist/docs/doxygen_classref.conf.cmake.in	2018-11-08 07:07:51 UTC (rev 3440)
@@ -38,7 +38,7 @@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = __VERSION__
+PROJECT_NUMBER         = @RTM_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Modified: trunk/OpenRTM-aist/docs/doxygen_idlref.conf.cmake.in
===================================================================
--- trunk/OpenRTM-aist/docs/doxygen_idlref.conf.cmake.in	2018-11-07 11:14:01 UTC (rev 3439)
+++ trunk/OpenRTM-aist/docs/doxygen_idlref.conf.cmake.in	2018-11-08 07:07:51 UTC (rev 3440)
@@ -38,7 +38,7 @@
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = __VERSION__
+PROJECT_NUMBER         = @RTM_VERSION@
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a