Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Cameo
cameo
Commits
686608fd
Commit
686608fd
authored
Dec 14, 2020
by
Shervin Nourbakhsh
Browse files
Merge commit '
ee5177b7
'
parents
5c6fbaaf
ee5177b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
686608fd
/target/
/bin/
/.settings/
build/
\ No newline at end of file
cameo-api-cpp/CMakeLists.txt
View file @
686608fd
...
...
@@ -18,12 +18,6 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
#set(BUILD_SHARED_LIBS True)
endif
()
if
(
NOT DEFINED CMAKE_CXX_STANDARD
)
# specify the C++ standard
set
(
CMAKE_CXX_STANDARD 17
)
set
(
CMAKE_CXX_STANDARD_REQUIRED True
)
endif
()
# fix the RPATH for the linker
#if(not APPLE)
...
...
@@ -70,7 +64,7 @@ target_include_directories(cameo
SYSTEM PRIVATE
${
Rapidjson_INCLUDE_DIRS
}
/
)
#target_include_directories(cameo PRIVATE ${DOCTEST_INCLUDE_DIR})
#
target_compile_features(cameo PUBLIC cxx_std_1
1
)
target_compile_features
(
cameo PUBLIC cxx_std_1
7
)
set_target_properties
(
cameo PROPERTIES
SOVERSION
${
PROJECT_VERSION_MAJOR
}
...
...
cameo-api-cpp/src/Server.cpp
View file @
686608fd
...
...
@@ -31,7 +31,8 @@
using
namespace
std
;
namespace
cameo
{
constexpr
int
defaultTimeout
=
10000
;
void
Server
::
initServer
(
const
Endpoint
&
endpoint
,
int
timeoutMs
)
{
Services
::
init
();
...
...
@@ -117,7 +118,7 @@ int Server::getAvailableTimeout() const {
return
timeout
;
}
else
{
return
10000
;
return
defaultTimeout
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment