Browse Source

Set _XOPEN_SOURCE to 600 if not defined
Remove dependency on non-generated file (avoid setting CMP0058) to solve ninja issue
Remove external ns relict

pschoppe 7 years ago
parent
commit
45ed4fc455
3 changed files with 2 additions and 11 deletions
  1. 0 3
      CMakeLists.txt
  2. 1 3
      doc/CMakeLists.txt
  3. 1 5
      include/ua_config.h.in

+ 0 - 3
CMakeLists.txt

@@ -355,9 +355,6 @@ if(UA_ENABLE_GENERATE_NAMESPACE0)
   list(APPEND lib_sources ${PROJECT_BINARY_DIR}/src_generated/ua_namespaceinit_generated.c)
 endif()
 
-if(UA_ENABLE_EXTERNAL_NAMESPACES)
-    list(APPEND exported_headers ${PROJECT_SOURCE_DIR}/include/ua_server_external_ns.h)
-endif()
 if(UA_ENABLE_NONSTANDARD_UDP)
     list(APPEND exported_headers ${PROJECT_SOURCE_DIR}/plugins/ua_network_udp.h)
 endif()

+ 1 - 3
doc/CMakeLists.txt

@@ -47,7 +47,6 @@ add_custom_target(doc_latex ${SPHINX_EXECUTABLE}
           ${DOC_SRC_DIR}/plugin_log.rst ${DOC_SRC_DIR}/plugin_network.rst
           ${DOC_SRC_DIR}/services.rst ${DOC_SRC_DIR}/plugin_access_control.rst
           ${DOC_SRC_DIR}/nodestore.rst ${DOC_SRC_DIR}/information_modelling.rst
-          ${DOC_SRC_DIR}/protocol.rst
           ${DOC_SRC_DIR}/tutorial_datatypes.rst
           ${DOC_SRC_DIR}/tutorial_client_firststeps.rst
           ${DOC_SRC_DIR}/tutorial_server_firststeps.rst
@@ -74,7 +73,6 @@ add_custom_target(doc ${SPHINX_EXECUTABLE}
           ${DOC_SRC_DIR}/plugin_log.rst ${DOC_SRC_DIR}/plugin_network.rst
           ${DOC_SRC_DIR}/services.rst ${DOC_SRC_DIR}/plugin_access_control.rst
           ${DOC_SRC_DIR}/nodestore.rst ${DOC_SRC_DIR}/information_modelling.rst
-          ${DOC_SRC_DIR}/protocol.rst
           ${DOC_SRC_DIR}/tutorial_datatypes.rst
           ${DOC_SRC_DIR}/tutorial_client_firststeps.rst
           ${DOC_SRC_DIR}/tutorial_server_firststeps.rst
@@ -87,4 +85,4 @@ add_custom_target(doc ${SPHINX_EXECUTABLE}
 add_dependencies(doc open62541)
 
 set_target_properties(doc doc_latex doc_pdf PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
-set_target_properties(doc doc_latex doc_pdf PROPERTIES FOLDER "open62541/doc")
+set_target_properties(doc doc_latex doc_pdf PROPERTIES FOLDER "open62541/doc")

+ 1 - 5
include/ua_config.h.in

@@ -46,11 +46,7 @@ extern "C" {
  * Standard Includes
  * ----------------- */
 #ifndef _XOPEN_SOURCE
- #if defined(__QNX__) || defined(__QNXNTO__)
-  # define _XOPEN_SOURCE 600
- #else
-  # define _XOPEN_SOURCE 500
- #endif
+# define _XOPEN_SOURCE 600
 #endif
 #ifndef _DEFAULT_SOURCE
 # define _DEFAULT_SOURCE