Commit add84f85 authored by Pawel Sznajder's avatar Pawel Sznajder
Browse files

Merge branch 'UpdatedDependencies' into 'master'

Updating code to more recent version of the the dependencies

See merge request !4
parents 39c959fe f36008a2
...@@ -2,3 +2,9 @@ ...@@ -2,3 +2,9 @@
/lib/ /lib/
/.externalToolBuilders/ /.externalToolBuilders/
/ElementaryUtils.doxyfile.bak /ElementaryUtils.doxyfile.bak
CMakeCache.txt
CMakeFiles/
ElementaryUtils_autogen/
Makefile
cmake_install.cmake
install_manifest.txt
...@@ -7,7 +7,12 @@ cmake_minimum_required(VERSION 2.6) ...@@ -7,7 +7,12 @@ cmake_minimum_required(VERSION 2.6)
project(ElementaryUtils CXX) project(ElementaryUtils CXX)
# define c++ standard and issue all the warning demanded by this standard # 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 ================================================================================== # VERSION ==================================================================================
...@@ -34,6 +39,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) ...@@ -34,6 +39,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
# FIND LIBRARIES =========================================================================== # FIND LIBRARIES ===========================================================================
# find libraries: Qt
find_package(Qt5 COMPONENTS Core)
# find libraries: additional modules # find libraries: additional modules
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
...@@ -78,7 +86,7 @@ target_link_libraries( ...@@ -78,7 +86,7 @@ target_link_libraries(
# install # install
install(TARGETS ElementaryUtils install(TARGETS ElementaryUtils
RUNTIME DESTINATION bin/PARTONS RUNTIME DESTINATION bin
LIBRARY DESTINATION lib/PARTONS LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib/static/PARTONS) ARCHIVE DESTINATION lib/static)
install(DIRECTORY include/ DESTINATION include/PARTONS) install(DIRECTORY include DESTINATION include)
...@@ -260,7 +260,8 @@ std::string StringUtils::vectorToString(std::vector<std::string>* vector) { ...@@ -260,7 +260,8 @@ std::string StringUtils::vectorToString(std::vector<std::string>* vector) {
std::string StringUtils::removeAfterLast(const std::string &chaine, std::string StringUtils::removeAfterLast(const std::string &chaine,
const char lastCharacter) { const char lastCharacter) {
std::vector<std::string> temp = split(chaine, lastCharacter); std::vector<std::string> temp = split(chaine, lastCharacter);
temp.erase(temp.end()); //temp.erase(temp.end());
temp.pop_back();
std::string res = EMPTY; std::string res = EMPTY;
......
...@@ -110,10 +110,12 @@ Packet& Packet::operator <<(short data) { ...@@ -110,10 +110,12 @@ Packet& Packet::operator <<(short data) {
} }
Packet& Packet::operator >>(const std::string& data) { Packet& Packet::operator >>(const std::string& data) {
return *this;
//TODO ? //TODO ?
} }
Packet& Packet::operator <<(const std::string& data) { Packet& Packet::operator <<(const std::string& data) {
return *this;
//TODO ? //TODO ?
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment