From d687d42918a07740acf8276d97d0cb56a112b844 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 6 Aug 2017 21:54:14 +0000 Subject: [PATCH] Merged from trunk: ------------------------------------------------------------------------ r8006 | k1jt | 2017-08-05 14:35:10 +0100 (Sat, 05 Aug 2017) | 1 line Minor edits to docs: TNX to IW3RAB! ------------------------------------------------------------------------ r8008 | k1jt | 2017-08-05 14:45:16 +0100 (Sat, 05 Aug 2017) | 1 line Minor tweak to a table size in User Guide. ------------------------------------------------------------------------ r8009 | k9an | 2017-08-06 18:14:04 +0100 (Sun, 06 Aug 2017) | 1 line Edits to end-of-line notations table in docs. ------------------------------------------------------------------------ r8010 | bsomervi | 2017-08-06 22:51:29 +0100 (Sun, 06 Aug 2017) | 1 line Don't let the Fortran/C/C++ interop test fail silently ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@8011 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 2 +- doc/user_guide/en/decoder_notes.adoc | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfea6bc9a..5aa7a9932 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -972,7 +972,7 @@ endif (NOT APPLE) # include (FortranCInterface) -FortranCInterface_VERIFY (CXX QUIET) +FortranCInterface_VERIFY (CXX) FortranCInterface_HEADER (FC.h MACRO_NAMESPACE "FC_" SYMBOL_NAMESPACE "FC_" SYMBOLS grayline diff --git a/doc/user_guide/en/decoder_notes.adoc b/doc/user_guide/en/decoder_notes.adoc index 88a467512..d4f966a69 100644 --- a/doc/user_guide/en/decoder_notes.adoc +++ b/doc/user_guide/en/decoder_notes.adoc @@ -40,7 +40,7 @@ successful decode used MyCall as hypothetically known information. [[AP_INFO_TABLE]] .AP information types -[width="25%",cols="h10,