IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

change protobuf include strategy

Browse Source
This commit is contained in:
einhornimmond 2021-02-10 10:14:56 +01:00 committed by Ulf Gebhardt
parent 8074d9ea65
commit feab9a99fa
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -118,7 +118,10 @@ set(CMAKE_CXX_FLAGS "/MP /EHsc")
#set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3") #set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3")
#set(CMAKE_CXX_FLAGS_RELEASE "-O3") #set(CMAKE_CXX_FLAGS_RELEASE "-O3")
else(WIN32) else()
find_package(Protobuf REQUIRED)
include_directories(${Protobuf_INCLUDE_DIRS})
find_library(IROHA_ED25519 ed25519 PATHS "dependencies/iroha-ed25519/build" REQUIRED) find_library(IROHA_ED25519 ed25519 PATHS "dependencies/iroha-ed25519/build" REQUIRED)
# set vars for mariadb cmake files # set vars for mariadb cmake files
set(INSTALL_BINDIR "bin") set(INSTALL_BINDIR "bin")
@ -133,15 +136,15 @@ include_directories(
endif(WIN32) endif()
target_link_libraries(Gradido_LoginServer ${CONAN_LIBS} ${IROHA_ED25519}) target_link_libraries(Gradido_LoginServer ${CONAN_LIBS} ${IROHA_ED25519})
if(WIN32) if(WIN32)
TARGET_LINK_LIBRARIES(Gradido_LoginServer optimized ${MYSQL_LIBRARIES} Shlwapi) TARGET_LINK_LIBRARIES(Gradido_LoginServer optimized ${MYSQL_LIBRARIES} Shlwapi)
TARGET_LINK_LIBRARIES(Gradido_LoginServer debug ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi) TARGET_LINK_LIBRARIES(Gradido_LoginServer debug ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi)
else(WIN32) else()
target_link_libraries(Gradido_LoginServer libmariadb protoc protobuf -pthread) target_link_libraries(Gradido_LoginServer libmariadb ${Protobuf_LIBRARIES} -pthread)
endif(WIN32) endif()
# install # install
if(UNIX) if(UNIX)
@ -169,8 +172,8 @@ target_link_libraries(Gradido_LoginServer_Test ${CONAN_LIBS} ${IROHA_ED25519})
if(WIN32) if(WIN32)
TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test optimized ${MYSQL_LIBRARIES} Shlwapi) TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test optimized ${MYSQL_LIBRARIES} Shlwapi)
TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi) TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${COMPILED_MARIADB_CLIENT_DEBUG} Shlwapi)
else(WIN32) else()
target_link_libraries(Gradido_LoginServer_Test libmariadb protoc protobuf -pthread) target_link_libraries(Gradido_LoginServer_Test libmariadb ${Protobuf_LIBRARIES} -pthread)
endif(WIN32) endif()
add_test(NAME main COMMAND Gradido_LoginServer_Test) add_test(NAME main COMMAND Gradido_LoginServer_Test)

17
Dockerfile
View File

@ -6,12 +6,25 @@ ENV DOCKER_WORKDIR="/code"
USER root USER root
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends protobuf-compiler && \ apt-get install -y --no-install-recommends protobuf-compiler libprotobuf-dev && \
apt-get autoclean && \ apt-get autoclean && \
apt-get autoremove && \ apt-get autoremove && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
#RUN grep processor /proc/cpuinfo | wc -l
#RUN mkdir -p "/helper"
#WORKDIR "/helper"
#RUN git clone --recurse-submodules https://github.com/protocolbuffers/protobuf.git
#RUN cd protobuf && \
#git checkout v3.14.0 && \
#./autogen.sh && \
#./configure && \
#make -j$(grep processor /proc/cpuinfo | wc -l) && \
#make check && \
#make install && \
#ldconfig
RUN mkdir -p ${DOCKER_WORKDIR} RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR}
@ -43,3 +56,5 @@ RUN mkdir build && \
cmake .. && \ cmake .. && \
make -j$(grep processor /proc/cpuinfo | wc -l) make -j$(grep processor /proc/cpuinfo | wc -l)
# deploy
#From

1
conanfile.txt
View File

@ -1,7 +1,6 @@
[requires] [requires]
Poco/1.9.4@pocoproject/stable Poco/1.9.4@pocoproject/stable
libsodium/1.0.18@bincrafters/stable libsodium/1.0.18@bincrafters/stable
protobuf/3.9.1@bincrafters/stable
boost/1.71.0@conan/stable boost/1.71.0@conan/stable
gtest/1.8.1@bincrafters/stable gtest/1.8.1@bincrafters/stable