Ver código fonte

move cmake folder to tools/cmake; fix rpi cross-compilation for gcc5

Julius Pfrommer 9 anos atrás
pai
commit
01cbd8c8d7

+ 1 - 1
.travis.yml

@@ -109,7 +109,7 @@ before_deploy:
 - git clone https://github.com/raspberrypi/tools
 - cd -
 - export PATH=$PATH:~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/
-- cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-rpi64.cmake -DENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLESERVER=ON -DBUILD_EXAMPLECLIENT=ON ..
+- cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-rpi64.cmake -DENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLESERVER=ON -DBUILD_EXAMPLECLIENT=ON ..
 - make 
 - tar -pczf open62541-raspberrypi.tar.gz ../doc ../server_cert.der ../LICENSE ../AUTHORS ../README.md server_static server client_static client libopen62541.so open62541.h open62541.c
 - cp open62541-raspberrypi.tar.gz ..

+ 1 - 1
CMakeLists.txt

@@ -34,7 +34,7 @@ add_definitions("-DVERSION=${GIT_COMMIT_ID}")
 
 message(STATUS "Git version: "  ${GIT_COMMIT_ID})
 
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
+set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/tools/cmake")
 
 ####################################
 # Build Type and Compiler Settings #

+ 1 - 1
include/ua_config.h.in

@@ -3,7 +3,7 @@
 
 #ifndef _XOPEN_SOURCE
 # define _XOPEN_SOURCE 500
-# define _BSD_SOURCE
+# define _DEFAULT_SOURCE
 #endif
 
 #define UA_LOGLEVEL ${UA_LOGLEVEL}

+ 0 - 1
include/ua_types.h

@@ -151,7 +151,6 @@ typedef uint32_t UA_StatusCode;
 /**
  * Array handling
  * --------------
- *
  * In OPC UA, arrays can have a length of zero or more with the usual meaning.
  * In addition, arrays can be undefined. Then, they don't even have a length. In
  * the binary encoding, this is indicated by an array of length -1.

cmake/FindCheck.cmake → tools/cmake/FindCheck.cmake


cmake/FindSphinx.cmake → tools/cmake/FindSphinx.cmake


cmake/Toolchain-gcc-m32.cmake → tools/cmake/Toolchain-gcc-m32.cmake


cmake/Toolchain-mingw32.cmake → tools/cmake/Toolchain-mingw32.cmake


cmake/Toolchain-mingw64.cmake → tools/cmake/Toolchain-mingw64.cmake


+ 1 - 1
cmake/Toolchain-rpi.cmake

@@ -5,7 +5,7 @@
 # 2) export path to one of the compilers
 # export PATH=$PATH:~/tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/bin/
 # 3) use this toolchain file 
-# cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-rpi.cmake -DEXAMPLESERVER=ON ..
+# cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-rpi.cmake -DEXAMPLESERVER=ON ..
 # make
 set(CMAKE_C_COMPILER arm-bcm2708hardfp-linux-gnueabi-gcc)
 set(CMAKE_CXX_COMPILER arm-bcm2708hardfp-linux-gnueabi-g++)

+ 1 - 1
cmake/Toolchain-rpi64.cmake

@@ -5,7 +5,7 @@
 # 2) export path to one of the compilers
 # export PATH=$PATH:~/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/
 # 3) use this toolchain file 
-# cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-rpi64.cmake -DEXAMPLESERVER=ON ..
+# cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-rpi64.cmake -DEXAMPLESERVER=ON ..
 # make
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)

+ 3 - 3
tools/travis_linux_script.sh

@@ -40,7 +40,7 @@ else
 	if [ "$CC" = "gcc" ]; then
 		echo "Cross compile release build for MinGW 32 bit"
 		mkdir -p build && cd build
-		cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw32.cmake -DUA_ENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DUA_BUILD_EXAMPLESERVER=ON -DUA_BUILD_EXAMPLECLIENT=ON -DUA_BUILD_EXAMPLES=ON ..
+		cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-mingw32.cmake -DUA_ENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DUA_BUILD_EXAMPLESERVER=ON -DUA_BUILD_EXAMPLECLIENT=ON -DUA_BUILD_EXAMPLES=ON ..
 		make -j8
 		zip -r open62541-win32.zip ../../doc ../../server_cert.der ../LICENSE ../AUTHORS ../README.md server_static.exe server.exe client.exe client_static.exe libopen62541.dll libopen62541.dll.a open62541.h open62541.c
 		cp open62541-win32.zip ..
@@ -48,7 +48,7 @@ else
 
 		echo "Cross compile release build for MinGW 64 bit"
 		mkdir -p build && cd build
-		cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-mingw64.cmake -DUA_ENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DUA_BUILD_EXAMPLESERVER=ON -DUA_BUILD_EXAMPLECLIENT=ON -DUA_BUILD_EXAMPLES=ON ..
+		cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-mingw64.cmake -DUA_ENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DUA_BUILD_EXAMPLESERVER=ON -DUA_BUILD_EXAMPLECLIENT=ON -DUA_BUILD_EXAMPLES=ON ..
 		make -j8
 		zip -r open62541-win64.zip ../../doc ../../server_cert.der ../LICENSE ../AUTHORS ../README.md server_static.exe server.exe client.exe client_static.exe libopen62541.dll libopen62541.dll.a open62541.h open62541.c
 		cp open62541-win64.zip ..
@@ -56,7 +56,7 @@ else
 
 		echo "Cross compile release build for 32-bit linux"
 		mkdir -p build && cd build
-		cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-gcc-m32.cmake -DUA_ENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DUA_BUILD_EXAMPLESERVER=ON -DUA_BUILD_EXAMPLECLIENT=ON ..
+		cmake -DCMAKE_TOOLCHAIN_FILE=../tools/cmake/Toolchain-gcc-m32.cmake -DUA_ENABLE_AMALGAMATION=ON -DCMAKE_BUILD_TYPE=Release -DUA_BUILD_EXAMPLESERVER=ON -DUA_BUILD_EXAMPLECLIENT=ON ..
 		make -j8
 		tar -pczf open62541-linux32.tar.gz ../../doc ../../server_cert.der ../LICENSE ../AUTHORS ../README.md server_static server client_static client libopen62541.so open62541.h open62541.c
 		cp open62541-linux32.tar.gz ..