Merge branch 'master' of https://github.com/open62541/open62541

doc/in_a_nutshell.rst

@@ -4,7 +4,7 @@ OPC UA in a nutshell
 OPC UA, a collection of services
 --------------------------------
 
-In OPC-UA, all communication is based on service calls, each consisting of a request and a response
+In OPC UA, all communication is based on service calls, each consisting of a request and a response
 message. Be careful to note the difference between services and methods. Services are pre-defined in
 the standard and cannot be changed. But you can use the *Call* service to invoke user-defined
 methods on the server.
@@ -22,9 +22,9 @@ each service is implemented in a single function. See the \ref services section
 +-----------------------------+-----------------------------+------------------------------+
 | GetEndpoints                | CloseSecureChannel          | ActivateSession              |
 +-----------------------------+-----------------------------+------------------------------+
-| RegisterServer              | CloseSession                |                              |
+| RegisterServer              |                             | CloseSession                 |
 +-----------------------------+-----------------------------+------------------------------+
-| Cancel                      |                             |                              |
+|                             |                             | Cancel                       |
 +-----------------------------+-----------------------------+------------------------------+
 
 **Interaction with the information model**

tests/CMakeLists.txt

@@ -1,6 +1,7 @@
 include_directories(${PROJECT_SOURCE_DIR}/include)
 include_directories(${PROJECT_SOURCE_DIR}/deps)
 include_directories(${PROJECT_SOURCE_DIR}/src)
+include_directories(${PROJECT_SOURCE_DIR}/src_extra)
 include_directories(${PROJECT_BINARY_DIR}/src_generated)
 
 find_package(Check REQUIRED)