Fixup a few small details.

Get rid of warnings from boost::placeholders by globally defining BOOST_BIND_GLOBAL_PLACEHOLDERS.
Add in a missing #include "InterSpec_config.h"
Add in some license statements to files missing.
Set range of CMake from 3.1 to 3.20, so that the most recent definitions will be used.
Update electron to 17.3.1
Update dependency build instructions for Linux.

Author: wcjohns

CMakeLists.txt

@@ -5,9 +5,9 @@ endif(POLICY CMP0091)
 
 cmake_policy(SET CMP0048 NEW)
 
-cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1...3.20 FATAL_ERROR)
 
-project(InterSpec VERSION 1.9.1)
+project(InterSpec VERSION 1.0.10)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

InterSpec/InterSpec_config.h.in

@@ -131,4 +131,9 @@ void log_developer_error( const char *location, const char *error );
 #define DATE_TIME_FORMAT_STR "dd/MM/yy hh:mm:ss"
 
 
+// Prevent some compile warnings from using like _1 instead of
+//  boost::placeholders::_1 (I think this must be in the Wt
+//  headers, since our code uses the namespace prefixes)
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+
 #endif // InterSpec_config_h

external_libs/Cuba-3.0/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(Cuba-3.0)
 #right now this file only compiles "cuhre" version of the integration routines
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required( VERSION 3.1...3.20 )
 
 
 

external_libs/Minuit2/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_policy(SET CMP0048 NEW)
 project( minuit2 VERSION 2 )
 
-cmake_minimum_required( VERSION 3.1 )
+cmake_minimum_required( VERSION 3.1...3.20 )
 
 
 set ( MINUIT_SRCS

external_libs/muparserx-4.0.7/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0048 NEW)
 ########################################################################
 # Project setup
 ########################################################################
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.1...3.20)
 project(muparserx VERSION 4.0.7 LANGUAGES CXX)
 
 ########################################################################

src/CompactFileManager.cpp

@@ -20,6 +20,9 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
+
+#include "InterSpec_config.h"
+
 #include <sstream>
 #include <string>
 #include <vector>

src/D3SpectrumDisplayDiv.cpp

@@ -1,3 +1,26 @@
+/* InterSpec: an application to analyze spectral gamma radiation data.
+ 
+ Copyright 2018 National Technology & Engineering Solutions of Sandia, LLC
+ (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+ Government retains certain rights in this software.
+ For questions contact William Johnson via email at wcjohns@sandia.gov, or
+ alternative emails of interspec@sandia.gov.
+ 
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #include "InterSpec_config.h"
 
 #include <memory>

src/D3TimeChart.cpp

@@ -1,3 +1,26 @@
+/* InterSpec: an application to analyze spectral gamma radiation data.
+ 
+ Copyright 2018 National Technology & Engineering Solutions of Sandia, LLC
+ (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+ Government retains certain rights in this software.
+ For questions contact William Johnson via email at wcjohns@sandia.gov, or
+ alternative emails of interspec@sandia.gov.
+ 
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #include "InterSpec_config.h"
 
 #include <tuple>

src/FluxTool.cpp

@@ -1,3 +1,26 @@
+/* InterSpec: an application to analyze spectral gamma radiation data.
+ 
+ Copyright 2018 National Technology & Engineering Solutions of Sandia, LLC
+ (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+ Government retains certain rights in this software.
+ For questions contact William Johnson via email at wcjohns@sandia.gov, or
+ alternative emails of interspec@sandia.gov.
+ 
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ 
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ 
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
 #define _USE_MATH_DEFINES
 
 #include "InterSpec_config.h"

target/electron/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Require CMake 3.15 to use MSVC_RUNTIME_LIBRARY
-cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.1...3.20 FATAL_ERROR)
 
 project( InterSpecAddOn )