diff --git a/CMakeLists.txt b/CMakeLists.txt index 497f74007e13d1f6dd1e209b382e326676a150be..3f3efdd46fe278ec89faef81762830fd678e2aa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ else () endif () #depending on libpappsomspp version : -SET(LIBPAPPSOMSPP_VERSION "0.3.4-1") +SET(LIBPAPPSOMSPP_VERSION "0.4.0-1") configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/debian/control @ONLY) @@ -56,7 +56,7 @@ SET(SOFTWARE_NAME "XTPcpp") SET(XTPCPP_VERSION_MAJOR "0") SET(XTPCPP_VERSION_MINOR "2") -SET(XTPCPP_VERSION_PATCH "14") +SET(XTPCPP_VERSION_PATCH "15") 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 d8d85ecfb8cc800d9b85a2db50a8deb37219cf34..957d82294065ab7fc20de8203f0ba7fbb7087757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xtpcpp (0.2.15-1) stretch; urgency=medium + + * new xic extractor API, spectral count export fallback, compar bug + fixed + + -- Olivier Langella <olivier.langella@u-psud.fr> Wed, 16 May 2018 11:36:53 +0200 + xtpcpp (0.2.14-2) stretch; urgency=medium * avoid libodsstream bug in compar sheets diff --git a/win64/work.cmake b/win64/work.cmake index 4a3c69c9b2338a5eaaf1049c4cb2bdce64aa3415..4f367806a3741ea192d71e4d08baf0d2bef61c89 100644 --- a/win64/work.cmake +++ b/win64/work.cmake @@ -2,9 +2,9 @@ # cd buildwin64 # cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../win64/work.cmake .. -set(ODSSTREAM_QT5_FOUND 1) -set(ODSSTREAM_INCLUDE_DIR "/home/langella/developpement/git/libodsstream/src") -set(ODSSTREAM_QT5_LIBRARY "/home/langella/developpement/git/libodsstream/cbuild/src/libodsstream-qt5.so") +#set(ODSSTREAM_QT5_FOUND 1) +#set(ODSSTREAM_INCLUDE_DIR "/home/langella/developpement/git/libodsstream/src") +#set(ODSSTREAM_QT5_LIBRARY "/home/langella/developpement/git/libodsstream/cbuild/src/libodsstream-qt5.so") set(PAPPSOMSPP_QT5_FOUND 1) set(PAPPSOMSPP_WIDGET_QT5_FOUND 1)