diff --git a/howto-pack-tgz.txt b/howto-pack-tgz.txt index b93835b08aff006d036c00045a07a5a4dec7703d..46d8c6cb6ecfc0f96f4d29ae9a76a17ba012fdc0 100755 --- a/howto-pack-tgz.txt +++ b/howto-pack-tgz.txt @@ -37,11 +37,11 @@ k tag v$V # Yes! Our IT wants version tags to start with "v". # to delete erroneous tag: git tag -d $X; git push origin :refs/tags/$X kush --tags -ssh wuttke@a mv /www/apps/src/frida/frida2.* /www/apps/src/frida/old/ +ssh apps@a mv /www/apps/src/frida/frida2.* /www/apps/src/frida/old/ -scp ~/data/tgz/$A.tgz wuttke@a:/www/apps/src/frida/ +scp ~/data/tgz/$A.tgz apps@a:/www/apps/src/frida/ -scp /G/f2/pub/CHANGELOG wuttke@a:/www/apps/src/frida/frida2-CHANGELOG +scp /G/f2/pub/CHANGELOG apps@a:/www/apps/src/frida/frida2-CHANGELOG ### advertise http://apps.jcns.fz-juelich.de/doku/frida -> News @@ -53,12 +53,13 @@ git checkout devel git rebase master cd /G/f2/pub vi CMakeLists.txt # version becomes "post-<release>" +vi CHANGELOG # add header for next release kcom -m "Starting post-$V" kush cd /G/f2/pub -mkdir mybuild -cd mybuild +mkdir build +cd build cmake .. m -j7 mi diff --git a/pub/CHANGELOG b/pub/CHANGELOG index e4b98d954479394834bb82ce75435df9a3bd4410..f1fd64f8d35d5e21fc35ece4a05bb4800000410a 100644 --- a/pub/CHANGELOG +++ b/pub/CHANGELOG @@ -1,7 +1,14 @@ +Release 2.4.2d of 9jan19: + +- Correct main CMakeLists.txt (policy made conditional) +- Remove obsolete pthread +- Requires lmfit8.2 and libcerf1.11 (important bug fixes) + Release 2.4.2c of 21dec18: - Fit outcomes mad/mrd: maximum abs/rel deviation of fit from data points -- Recommends lmfit8.1 and libcerf1.10. +- Recommends lmfit8.1 +- Remove yaml-cpp from 3rdparty, not needed after all it seems Release 2.4.2b of 2oct18: @@ -9,7 +16,7 @@ Release 2.4.2b of 2oct18: Release 2.4.2a of 19sep18: -- Requires lmfit8.0, to get parameter error estimates. +- Requires lmfit8.0, to get parameter error estimates - New commands cpe, cpc(a,r,p) to print parameter errors or covariance matrices. - Update googletest, and wrap as in other projects - Prevent building with wrong yaml-cpp version @@ -37,7 +44,7 @@ Release 2.4.1a of 27feb18: - Gnuplot limits with full accuracy - programmable tictac color and other improvements in PS graphics - Changed dependences: - - requires lmfit 7.0. + - requires lmfit 7.0 Release 2.4.0g of 11aug17: diff --git a/pub/CMakeLists.txt b/pub/CMakeLists.txt index deada75252c5bc5abbf19507383d679d6218e49c..8ec7dd64bfdfff0e6caae6813fb1a5556a206501 100644 --- a/pub/CMakeLists.txt +++ b/pub/CMakeLists.txt @@ -1,5 +1,7 @@ -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) -cmake_policy(SET CMP0077 NEW) +cmake_minimum_required(VERSION 3.8 FATAL_ERROR) +if(POLICY CMP0077) + cmake_policy(SET CMP0077 NEW) # since 3.13 +endif() set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) include(PreventInSourceBuilds) @@ -8,7 +10,7 @@ option(PEDANTIC "Compile with pedantic warnings" ON) project(Frida) -set(Frida_VERSION 2.4.2c) +set(Frida_VERSION 2.4.2d) set(CMAKE_CXX_STANDARD 11) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -40,6 +42,7 @@ find_package(KWW REQUIRED) find_package(Cerf REQUIRED) find_package(LMFit REQUIRED) find_package(Gnuplot REQUIRED) +message(STATUS "All required packages found") add_subdirectory(readplus) add_subdirectory(trivia) @@ -49,10 +52,18 @@ add_subdirectory(src) add_subdirectory(share) add_subdirectory(man) +message(STATUS "Now configuring gtest") +set(gtest_disable_pthreads ON) add_subdirectory(3rdparty/gtest) +message(STATUS "Now configuring utest") add_subdirectory(utest) # unit tests +message(STATUS "Now configuring ftest") add_subdirectory(ftest) # functional tests (run Frida with given script) # --- Additional tests to be activated when needed --- +message(STATUS "Now configuring ptest") add_subdirectory(ptest) # performance tests + # add_subdirectory(readplus/test) # interactive readline test + +message(STATUS "End of main/CMakeLists.txt") diff --git a/pub/lib/CMakeLists.txt b/pub/lib/CMakeLists.txt index d57ae7585b41850096a756c74e717ef6953ed1f6..cf22fb8d09bed9d563ec34518c7da33970d07290 100644 --- a/pub/lib/CMakeLists.txt +++ b/pub/lib/CMakeLists.txt @@ -95,7 +95,6 @@ target_link_libraries(${library_name} ${readplus_LIBRARY} ${fridatrivia_LIBRARY} ${fridaplot_LIBRARY} - pthread ${FFTW_LIBRARIES} ${KWW_LIBRARIES} ${Cerf_LIBRARIES}