From 82aab68944e72a0b65b423a0bf5c5b24d73341e0 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Mon, 21 Jan 2019 21:21:01 +0100 Subject: [PATCH] Changed build types --- libraries/DataPipes | 2 +- libraries/build_boringssl.sh | 2 +- libraries/build_cxxterminal.sh | 2 +- libraries/build_datapipes.sh | 2 +- libraries/build_ed25519.sh | 2 +- libraries/build_jsoncpp.sh | 2 +- libraries/build_mysqlconnector.sh | 2 +- libraries/build_protobuf.sh | 2 +- libraries/build_stringvariable.sh | 2 +- libraries/build_threadpool.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/DataPipes b/libraries/DataPipes index 277bbe1..a8fd0a6 160000 --- a/libraries/DataPipes +++ b/libraries/DataPipes @@ -1 +1 @@ -Subproject commit 277bbe14f87399aabe5f67e7bc4cb986e974bb09 +Subproject commit a8fd0a621ff7ac522e4278dd97bf805557b5fe4d diff --git a/libraries/build_boringssl.sh b/libraries/build_boringssl.sh index ca81d0a..817da25 100755 --- a/libraries/build_boringssl.sh +++ b/libraries/build_boringssl.sh @@ -13,6 +13,6 @@ if [ $? -ne 0 ]; then fi cd build sudo apt-get install golang-go -cmake .. -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DOPENSSL_NO_ASM=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} #sudo make install diff --git a/libraries/build_cxxterminal.sh b/libraries/build_cxxterminal.sh index b0a8af3..cc51a39 100755 --- a/libraries/build_cxxterminal.sh +++ b/libraries/build_cxxterminal.sh @@ -1,6 +1,6 @@ cd CXXTerminal/libraries/ ./build_event.sh #TODO test status! cd ../build/ -cmake .. -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_datapipes.sh b/libraries/build_datapipes.sh index 38f5fa3..5edda74 100755 --- a/libraries/build_datapipes.sh +++ b/libraries/build_datapipes.sh @@ -4,6 +4,6 @@ sudo apt-get install libnice-dev ./build_srtp.sh ./build_sdptransform.sh cd build -cmake .. -DCMAKE_CXX_FLAGS="-I../../boringssl/include/ -DUSE_BORINGSSL -static-libgcc -static-libstdc++ ${CXX_FLAGS}" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DCMAKE_CXX_FLAGS="-I../../boringssl/include/ -DUSE_BORINGSSL -static-libgcc -static-libstdc++ ${CXX_FLAGS}" -DBUILD_TESTS=OFF -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_ed25519.sh b/libraries/build_ed25519.sh index 5c96d10..64cf716 100755 --- a/libraries/build_ed25519.sh +++ b/libraries/build_ed25519.sh @@ -1,4 +1,4 @@ cd ed25519/build/ -cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DCMAKE_C_FLAGS="-I../../boringssl/include/ -L../../boringssl/build/ssl/ -L../../boringssl/build/crypto/ ${C_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_jsoncpp.sh b/libraries/build_jsoncpp.sh index c29dd67..12a5234 100755 --- a/libraries/build_jsoncpp.sh +++ b/libraries/build_jsoncpp.sh @@ -1,4 +1,4 @@ cd jsoncpp/build -cmake .. -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_mysqlconnector.sh b/libraries/build_mysqlconnector.sh index 20ddd68..f36d0d6 100755 --- a/libraries/build_mysqlconnector.sh +++ b/libraries/build_mysqlconnector.sh @@ -11,6 +11,6 @@ if ! [ "${HEADER:0:34}" == "#if !defined(SSL_ERROR_WANT_ASYNC)" ]; then `cat cdk/foundation/connection_openssl.cc`" > cdk/foundation/connection_openssl.cc fi cd build -cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -I../../boringssl/include/ ${CXX_FLAGS}" -DWITH_JDBC=ON -DWITH_SSL="`pwd`/../../boringssl/" -DOPENSSL_ROOT_DIR="`pwd`/../../boringssl/" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_protobuf.sh b/libraries/build_protobuf.sh index adaf5e1..693924c 100755 --- a/libraries/build_protobuf.sh +++ b/libraries/build_protobuf.sh @@ -1,7 +1,7 @@ cd protobuf git checkout 3.5.1.1 cd build -cmake ../cmake/ -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake ../cmake/ -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_CXX_FLAGS="-std=c++11 -fPIC ${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE=RelWithDebInfo ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install #sudo ldconfig diff --git a/libraries/build_stringvariable.sh b/libraries/build_stringvariable.sh index c78b43f..23b7699 100755 --- a/libraries/build_stringvariable.sh +++ b/libraries/build_stringvariable.sh @@ -1,4 +1,4 @@ cd StringVariable/build/ -cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -fPIC" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -fPIC" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install diff --git a/libraries/build_threadpool.sh b/libraries/build_threadpool.sh index 9bc491e..4a3e12f 100755 --- a/libraries/build_threadpool.sh +++ b/libraries/build_threadpool.sh @@ -1,4 +1,4 @@ cd Thread-Pool/build/ -cmake .. -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" ${CMAKE_OPTIONS} +cmake .. -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_C_FLAGS="${C_FLAGS}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" ${CMAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} sudo make install