diff --git a/CMakeLists.txt b/CMakeLists.txt index c89322c553866fbfad4e368f01b9e3f10546e2ec..b29c7adeb5778870d8242e9450cfa463950c3965 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ ENDIF( CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" ) set(CMAKE_CXX_STANDARD 14) #depending on libpappsomspp version : -SET(LIBPAPPSOMSPP_VERSION "0.2.37-1") +SET(LIBPAPPSOMSPP_VERSION "0.2.38-1") configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY) @@ -41,7 +41,7 @@ SET(SOFTWARE_NAME "XTPcpp") SET(XTPCPP_VERSION_MAJOR "0") SET(XTPCPP_VERSION_MINOR "1") -SET(XTPCPP_VERSION_PATCH "20") +SET(XTPCPP_VERSION_PATCH "21") SET(XTPCPP_VERSION "${XTPCPP_VERSION_MAJOR}.${XTPCPP_VERSION_MINOR}.${XTPCPP_VERSION_PATCH}") # Set the CMAKE_PREFIX_PATH for the find_library fonction when using non diff --git a/debian/changelog b/debian/changelog index 1c6cfaa03d224851b64c3653ce9c8a4c7272e1c3..055a95a3084d3d3739c103299bab1d1d8169ec17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xtpcpp (0.1.21-1) stretch; urgency=medium + + * tandem file check + * better tandem form + * multiple directory upload + * monitoring grouping (and faster grouping) + + -- Olivier Langella <olivier.langella@u-psud.fr> Sat, 21 Oct 2017 11:58:51 +0200 + xtpcpp (0.1.20-2) stretch; urgency=medium * tandem parameter form hardened diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f91d1eecf7a2a6d80d96b076cdea8fbeed9ea971..4db3e0c05c1d6c3cb5981168dddd7e820cc112af 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,11 +28,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5 #sudo apt-get install libpappsomspp-dev FIND_PACKAGE( Pappsomspp REQUIRED ) -SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp") +#SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp") # SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp") - SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") - SET (PAPPSOMSPP_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so") - SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so") +# SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") +# SET (PAPPSOMSPP_QT5_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt5.so") +# SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so") set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)