TeaSpeak/Server-Root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated some cmake script

Browse Source
This commit is contained in:
WolverinDEV 2020-01-24 15:10:26 +01:00
parent 737ada0680
commit a6db341785
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-helpers

@ -1 +1 @@
Subproject commit fa82de18241ef5c4cf4fc8328137f726b572827e Subproject commit ed6468e2c31b2ce3c9d69a06adefef278e507971

2
libraries/build.sh
View File

@ -67,7 +67,7 @@ exec_script_external build_ed25519.sh ed25519
exec_script_external build_jsoncpp.sh jsoncpp exec_script_external build_jsoncpp.sh jsoncpp
#exec_script build_mysqlconnector.sh #exec_script build_mysqlconnector.sh
exec_script_external build_opus.sh opus exec_script_external build_opus.sh opus
exec_script_external build_protobuf.sh protobuf exec_script build_protobuf.sh protobuf
exec_script_external build_spdlog.sh spdlog exec_script_external build_spdlog.sh spdlog
exec_script_external build_stringvariable.sh StringVariable exec_script_external build_stringvariable.sh StringVariable
exec_script_external build_threadpool.sh Thread-Pool exec_script_external build_threadpool.sh Thread-Pool

26
libraries/build_protobuf.sh
View File

@ -1,7 +1,23 @@
cd protobuf [[ -z "${build_helper_file}" ]] && {
echo "Missing build helper file. Please define \"build_helper_file\""
exit 1
}
source ${build_helper_file}
[[ $build_helpers_defined -ne 1 ]] && {
echo "Failed to include build helpers."
exit 1
}
requires_rebuild ${library_path}
[[ $? -eq 0 ]] && exit 0
cd protobuf || exit 1
# git checkout 3.5.1.1 # git checkout 3.5.1.1
cd build cd build || exit 1
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} 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} || exit 1
make ${CMAKE_MAKE_OPTIONS} make ${CMAKE_MAKE_OPTIONS} || exit 1
sudo make install sudo make install || exit 1
#sudo ldconfig #sudo ldconfig
set_build_successful ${library_path}