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

update CMakeFile, it seems that by merging old bugs reappear

Browse Source
This commit is contained in:
einhornimmond 2021-04-08 12:50:25 +02:00
parent 0de4ea971b
commit d4bfa7d20f
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/login_server/grd_login.properties
View File

@ -40,6 +40,7 @@ hedera.nettype = TESTNET
# server setup types: test, staging or production # server setup types: test, staging or production
ServerSetupType=test ServerSetupType=test
dev.default_group = docker
# Session timeout in minutes # Session timeout in minutes

14
login_server/CMakeLists.txt
View File

@ -82,7 +82,7 @@ if(MSVC)
source_group("Test\\model" FILES ${TEST_MODEL}) source_group("Test\\model" FILES ${TEST_MODEL})
source_group("Test\\controller" FILES ${TEST_CONTROLLER}) source_group("Test\\controller" FILES ${TEST_CONTROLLER})
source_group("Test" FILES ${TEST}) source_group("Test" FILES ${TEST})
endif(MSVC) endif()
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
@ -140,7 +140,7 @@ if(WIN32)
list(REMOVE_ITEM CONAN_LIBS "ssleay32.lib") list(REMOVE_ITEM CONAN_LIBS "ssleay32.lib")
else (WIN32) else()
#find_package(MariaDBClient PATHS "dependencies/cmake-modules") #find_package(MariaDBClient PATHS "dependencies/cmake-modules")
#find_library(MYSQL_LIBRARIES libmariadb.so PATHS ${MARIADB_CONNECTOR_PATH} REQUIRED) #find_library(MYSQL_LIBRARIES libmariadb.so PATHS ${MARIADB_CONNECTOR_PATH} REQUIRED)
find_library(CONAN_OPENSSL_SSL ssl PATHS ${CONAN_LIB_DIRS_OPENSSL} REQUIRED NO_DEFAULT_PATH ) find_library(CONAN_OPENSSL_SSL ssl PATHS ${CONAN_LIB_DIRS_OPENSSL} REQUIRED NO_DEFAULT_PATH )
@ -160,7 +160,7 @@ else (WIN32)
list(REMOVE_ITEM CONAN_LIBS "crypto") list(REMOVE_ITEM CONAN_LIBS "crypto")
list(REMOVE_ITEM CONAN_LIBS "dl") list(REMOVE_ITEM CONAN_LIBS "dl")
endif(WIN32) endif()
# load same ssl version like used from poco # load same ssl version like used from poco
#find_package(OpenSSL PATHS "../" NO_DEFAULT_PATH) #find_package(OpenSSL PATHS "../" NO_DEFAULT_PATH)
@ -202,9 +202,9 @@ 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)
TARGET_LINK_LIBRARIES(Gradido_LoginServer debug ${GRPC_LIBS} ${PROTOBUF_DEBUG_LIBS}) TARGET_LINK_LIBRARIES(Gradido_LoginServer debug ${GRPC_LIBS} ${PROTOBUF_DEBUG_LIBS})
else(WIN32) # unix else() # unix
target_link_libraries(Gradido_LoginServer libmariadb ${GRPC_LIBS} ${CMAKE_DL_LIBS} ${PROTOBUF_LIBS}) target_link_libraries(Gradido_LoginServer libmariadb ${GRPC_LIBS} ${CMAKE_DL_LIBS} ${PROTOBUF_LIBS})
endif(WIN32) endif()
# install # install
if(UNIX) if(UNIX)
@ -235,8 +235,8 @@ 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)
TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${GRPC_LIBS} ${PROTOBUF_DEBUG_LIBS}) TARGET_LINK_LIBRARIES(Gradido_LoginServer_Test debug ${GRPC_LIBS} ${PROTOBUF_DEBUG_LIBS})
else(WIN32) else()
target_link_libraries(Gradido_LoginServer_Test libmariadb ${GRPC_LIBS} ${CMAKE_DL_LIBS} ${PROTOBUF_LIBS}) target_link_libraries(Gradido_LoginServer_Test libmariadb ${GRPC_LIBS} ${CMAKE_DL_LIBS} ${PROTOBUF_LIBS})
endif(WIN32) endif()
add_test(NAME main COMMAND Gradido_LoginServer_Test) add_test(NAME main COMMAND Gradido_LoginServer_Test)