Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
partons
core
elementary-utils
Commits
f36008a2
Commit
f36008a2
authored
May 16, 2020
by
Valerio Bertone
Browse files
Updating code to more recent version of the the dependencies
parent
39c959fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
f36008a2
...
...
@@ -2,3 +2,9 @@
/lib/
/.externalToolBuilders/
/ElementaryUtils.doxyfile.bak
CMakeCache.txt
CMakeFiles/
ElementaryUtils_autogen/
Makefile
cmake_install.cmake
install_manifest.txt
CMakeLists.txt
View file @
f36008a2
...
...
@@ -7,7 +7,12 @@ cmake_minimum_required(VERSION 2.6)
project
(
ElementaryUtils CXX
)
# define c++ standard and issue all the warning demanded by this standard
add_definitions
(
-std=c++98 -pedantic
)
add_definitions
(
-std=c++11 -pedantic -Wno-vla-extension
)
set
(
CMAKE_CXX_STANDARD 11
)
if
(
NOT DEFINED CMAKE_MACOSX_RPATH
)
set
(
CMAKE_MACOSX_RPATH 0
)
endif
()
# VERSION ==================================================================================
...
...
@@ -34,6 +39,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# FIND LIBRARIES ===========================================================================
# find libraries: Qt
find_package
(
Qt5 COMPONENTS Core
)
# find libraries: additional modules
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
CMAKE_SOURCE_DIR
}
/cmake/Modules/"
)
...
...
@@ -78,7 +86,7 @@ target_link_libraries(
# install
install
(
TARGETS ElementaryUtils
RUNTIME DESTINATION bin
/PARTONS
LIBRARY DESTINATION lib
/PARTONS
ARCHIVE DESTINATION lib/static
/PARTONS
)
install
(
DIRECTORY include
/
DESTINATION include
/PARTONS
)
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static
)
install
(
DIRECTORY include DESTINATION include
)
src/ElementaryUtils/string_utils/StringUtils.cpp
View file @
f36008a2
...
...
@@ -260,7 +260,8 @@ std::string StringUtils::vectorToString(std::vector<std::string>* vector) {
std
::
string
StringUtils
::
removeAfterLast
(
const
std
::
string
&
chaine
,
const
char
lastCharacter
)
{
std
::
vector
<
std
::
string
>
temp
=
split
(
chaine
,
lastCharacter
);
temp
.
erase
(
temp
.
end
());
//temp.erase(temp.end());
temp
.
pop_back
();
std
::
string
res
=
EMPTY
;
...
...
src/ElementaryUtils/thread/Packet.cpp
View file @
f36008a2
...
...
@@ -110,10 +110,12 @@ Packet& Packet::operator <<(short data) {
}
Packet
&
Packet
::
operator
>>
(
const
std
::
string
&
data
)
{
return
*
this
;
//TODO ?
}
Packet
&
Packet
::
operator
<<
(
const
std
::
string
&
data
)
{
return
*
this
;
//TODO ?
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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