Bläddra i källkod

Remove remaining use of UA_ENABLE_FULL_NS0

Julius Pfrommer 6 år sedan
förälder
incheckning
214d439988

+ 1 - 1
examples/nodeset/CMakeLists.txt

@@ -45,7 +45,7 @@ endif()
 ###################
 
 # PLCopen requires the full ns0 as basis
-if(UA_ENABLE_FULL_NS0)
+if(UA_NAMESPACE_ZERO STREQUAL "FULL")
 
     # Generate types for DI namespace
     set(UA_TYPES_OUT "ua_types_di")

+ 1 - 1
tests/nodeset-compiler/CMakeLists.txt

@@ -32,7 +32,7 @@ add_test_valgrind(nodeset_objecttype ${TESTS_BINARY_DIR}/check_nodeset_objecttyp
 # Test Companion Specs that need the full NS0 #
 ###############################################
 
-if(UA_ENABLE_FULL_NS0)
+if(UA_NAMESPACE_ZERO STREQUAL "FULL")
 
     # Generate types for DI namespace
     set(UA_TYPES_OUT "ua_types_di")

+ 1 - 1
tools/travis/travis_osx_script.sh

@@ -17,7 +17,7 @@ echo -en 'travis_fold:end:script.build.doc\\r'
 echo "Full Namespace 0 Generation" && echo -en 'travis_fold:start:script.build.ns0\\r'
 mkdir -p build
 cd build
-cmake -DCMAKE_BUILD_TYPE=Debug -DUA_ENABLE_FULL_NS0=ON -DUA_BUILD_EXAMPLES=ON  ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DUA_NAMESPACE_ZERO=FULL -DUA_BUILD_EXAMPLES=ON  ..
 make -j
 cd .. && rm -rf build
 echo -en 'travis_fold:end:script.build.ns0\\r'