Przeglądaj źródła

Merge branch 'master' into inline_setattribute

Julius Pfrommer 9 lat temu
rodzic
commit
2a28224dd2
3 zmienionych plików z 524 dodań i 505 usunięć
  1. 3 1
      CMakeLists.txt
  2. 519 502
      examples/client_legacy.c
  3. 2 2
      tools/travis_linux_before_install.sh

+ 3 - 1
CMakeLists.txt

@@ -248,7 +248,9 @@ if(EXTENSION_UDP)
 	message(STATUS "Extensions: enabling udp")
 	add_definitions(-DEXTENSION_UDP)
 	add_executable(exampleServerUDP $<TARGET_OBJECTS:open62541-object> examples/networklayer_udp.c examples/server_udp.c)
-  target_link_libraries(exampleServerUDP urcu-cds urcu urcu-common)
+  if(ENABLE_MULTITHREADING)
+  	target_link_libraries(exampleServerUDP urcu-cds urcu urcu-common)
+  endif()
   if (NOT APPLE)
       target_link_libraries(exampleServerUDP rt)
   endif()

Plik diff jest za duży
+ 519 - 502
examples/client_legacy.c


+ 2 - 2
tools/travis_linux_before_install.sh

@@ -5,8 +5,8 @@ sudo add-apt-repository ppa:kalakris/cmake -y
 sudo apt-get update -qq
 sudo apt-get install -qq --no-install-recommends build-essential cmake python-lxml gcc-multilib graphviz doxygen wget zip
 sudo apt-get install libsubunit-dev #for check_0.10.0
-wget http://ftp.de.debian.org/debian/pool/main/c/check/check_0.10.0-2_amd64.deb
-sudo dpkg -i check_0.10.0-2_amd64.deb
+wget http://ftp.de.debian.org/debian/pool/main/c/check/check_0.10.0-3_amd64.deb
+sudo dpkg -i check_0.10.0-3_amd64.deb
 wget https://launchpad.net/ubuntu/+source/liburcu/0.8.5-1ubuntu1/+build/6513813/+files/liburcu2_0.8.5-1ubuntu1_amd64.deb
 wget https://launchpad.net/ubuntu/+source/liburcu/0.8.5-1ubuntu1/+build/6513813/+files/liburcu-dev_0.8.5-1ubuntu1_amd64.deb
 sudo dpkg -i liburcu2_0.8.5-1ubuntu1_amd64.deb