Merge branch 'feature/cmake' into feature/cmake2

Author: markusgft

README.md

@@ -1,5 +1,5 @@
 # Control Toolbox
-![Travis (.org) branch](https://img.shields.io/travis/ethz-adrl/control-toolbox/3.0.0.svg?style=popout-square)
+![Travis (.org) branch](https://img.shields.io/travis/ethz-adrl/control-toolbox/3.0.1.svg?style=popout-square)
 ![GitHub top language](https://img.shields.io/github/languages/top/ethz-adrl/control-toolbox.svg?style=social)
 ![GitHub](https://img.shields.io/github/license/ethz-adrl/control-toolbox.svg?style=social)
 

ct/package.xml

@@ -1,8 +1,8 @@
 <package>
   <name>ct</name>
-  <version>0.3.0</version>
+  <version>3.0.1</version>
   <description>
-    ADRL Control Toolbox v3.0
+    ADRL Control Toolbox 3.0.1
   </description>
   <maintainer email="markusgft@gmail.com">Markus Giftthaler</maintainer>  
   <license>BSD-2</license>

ct_core/CMakeLists.txt

@@ -5,7 +5,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../ct/cmake/explicitTemplateHelpers.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../ct/cmake/clang-cxx-dev-tools.cmake)
 
 
-project(ct_core VERSION 3.0.0 LANGUAGES CXX)
+project(ct_core VERSION 3.0.1 LANGUAGES CXX)
 
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

ct_core/doc/CMakeLists.txt

@@ -3,17 +3,11 @@ find_package(Doxygen)
 
 if(DOXYGEN_FOUND)
 
-    set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/ct_core.doxyfile)
-    set(doxyfile ${CMAKE_CURRENT_SOURCE_DIR}/../Doxyfile)
-
-    configure_file(${doxyfile_in} ${doxyfile} @ONLY)
-
     add_custom_target(doc
         COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
-        COMMAND ${DOXYGEN_EXECUTABLE} ${doxyfile}
+        COMMAND ${DOXYGEN_EXECUTABLE} ct_core.doxyfile
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         COMMAND ${CMAKE_COMMAND} -E echo_append "API Documentation built in ${CMAKE_CURRENT_SOURCE_DIR}"
         VERBATIM)
 
-    install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/html DESTINATION share/ct_core/doc)
 endif()

ct_core/doc/DoxygenLayout.xml

@@ -2,7 +2,12 @@
   <!-- Generated by doxygen 1.8.7 -->
   <!-- Navigation index tabs for HTML output -->
   <navindex>
-    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="mainpage" visible="no" title=""/>
+    <tab type="user" url="../../../ct_doc/doc/html/index.html" title="Home"/>
+    <tab type="user" url="../../../ct_core/doc/html/index.html" title="Core module"/>
+    <tab type="user" url="../../../ct_optcon/doc/html/index.html" title="Optimal Control"/>
+    <tab type="user" url="../../../ct_rbd/doc/html/index.html" title="Robot Module"/>
+    <tab type="user" url="../../../ct_models/doc/html/index.html" title="Models"/>
     <tab type="pages" visible="yes" title="" intro=""/>
     <tab type="modules" visible="no" title="" intro=""/>
     <tab type="namespaces" visible="yes" title="">

ct_core/doc/ct_core.doxyfile

@@ -32,26 +32,26 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = ct_core
+PROJECT_NAME           = " "
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v3.0
+PROJECT_NUMBER         = 3.0.1
 
 # 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
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Control Toolbox - Core Module"
+PROJECT_BRIEF          = "  - 3.0.1 core module."
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = ../../ct_doc/doc/ct_logo_small.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -1105,7 +1105,7 @@ HTML_EXTRA_FILES       =
 # Minimum value: 0, maximum value: 359, default value: 220.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_HUE    = 1
+HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A
@@ -1984,9 +1984,11 @@ SKIP_FUNCTION_MACROS   = YES
 # Note: Each tag file must have a unique name (where the name does NOT include
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
-#TAGFILES               = tags/ct_optcon.tag=../../../ct_optcon/doc/html \
-#                         tags/ct_rbd.tag=../../../ct_rbd/doc/html \
-#                         tags/ct_models.tag=../../../ct_models/doc/html
+TAGFILES               = ../../ct_doc/doc/tags/ct_doc.tag=../../../ct_doc/doc/html \
+						../../ct_doc/doc/tags/ct_optcon.tag=../../../ct_optcon/doc/html \
+						../../ct_doc/doc/tags/ct_rbd.tag=../../../ct_rbd/doc/html \
+                        ../../ct_doc/doc/tags/ct_models.tag=../../../ct_models/doc/html 
+
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to
@@ -1998,14 +2000,14 @@ GENERATE_TAGFILE       = ../../ct_doc/doc/tags/ct_core.tag
 # class index. If set to NO only the inherited external classes will be listed.
 # The default value is: NO.
 
-ALLEXTERNALS           = NO
+ALLEXTERNALS           = YES
 
 # If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
 # the modules index. If set to NO, only the current project's groups will be
 # listed.
 # The default value is: YES.
 
-EXTERNAL_GROUPS        = NO
+EXTERNAL_GROUPS        = YES
 
 # If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
 # the related pages index. If set to NO, only the current project's pages will

ct_core/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
   <name>ct_core</name>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
   <description>
     Control toolbox - core module.
   </description>

ct_doc/CMakeLists.txt

@@ -14,10 +14,7 @@ find_package(ct_models REQUIRED)
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
 
-    set(doxyfile_in ${CMAKE_CURRENT_SOURCE_DIR}/doc/ct_doc.doxyfile)
-    set(doxyfile ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
-
-    configure_file(${doxyfile_in} ${doxyfile} @ONLY)
+    set(doxyfile ${CMAKE_CURRENT_SOURCE_DIR}/doc/ct_doc.doxyfile)
 
     add_custom_target(doc
         COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."

ct_doc/doc/DoxygenLayout.xml

@@ -1,10 +1,15 @@
 <doxygenlayout version="1.0">
   <!-- Generated by doxygen 1.8.7 -->
   <!-- Navigation index tabs for HTML output -->
+  <!-- >test <-->
   <navindex>
-    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="mainpage" visible="yes" title="Home"/>
+    <tab type="user" url="../../../ct_core/doc/html/index.html" title="Core module"/>
+    <tab type="user" url="../../../ct_optcon/doc/html/index.html" title="Optimal Control"/>
+    <tab type="user" url="../../../ct_rbd/doc/html/index.html" title="Robot Module"/>
+    <tab type="user" url="../../../ct_models/doc/html/index.html" title="Models"/>
     <tab type="pages" visible="yes" title="" intro=""/>
-    <tab type="modules" visible="no" title="" intro=""/>
+    <tab type="modules" visible="no" title="Modules" intro=""/>
     <tab type="namespaces" visible="yes" title="">
       <tab type="namespacelist" visible="yes" title="" intro=""/>
       <tab type="namespacemembers" visible="yes" title="" intro=""/>

ct_doc/doc/ct_doc.doxyfile

@@ -32,26 +32,26 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = ct
+PROJECT_NAME           = " "
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v3.0
+PROJECT_NUMBER         = 3.0.1
 
 # 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
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Control Toolbox"
+PROJECT_BRIEF          = ""
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = ct_logo_small.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -1420,7 +1420,7 @@ EXT_LINKS_IN_WINDOW    = NO
 # Minimum value: 8, maximum value: 50, default value: 10.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-FORMULA_FONTSIZE       = 10
+FORMULA_FONTSIZE       = 11
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
@@ -2003,7 +2003,7 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               = tags/ct_core.tag=../../../ct_core/doc/html \
+TAGFILES               = tags/ct_core.tag=../../ct_core/doc/html \
                          tags/ct_optcon.tag=../../../ct_optcon/doc/html \
                          tags/ct_rbd.tag=../../../ct_rbd/doc/html \
                          tags/ct_models.tag=../../../ct_models/doc/html