Trye having CMake generate export header.

Author: wcjohns

CMakeLists.txt

@@ -283,6 +283,18 @@ set_target_properties( SpecUtils PROPERTIES PREFIX "lib" OUTPUT_NAME "SpecUtils"
 # Make so on Windows the functions/classes will be exported
 target_compile_definitions( SpecUtils PRIVATE SpecUtils_EXPORTS )
 
+# Include the GenerateExportHeader module
+include(GenerateExportHeader)
+generate_export_header(SpecUtils
+    BASE_NAME SpecUtils
+    EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/SpecUtilsExport.h
+)
+
+if( NOT SpecUtils_SHARED_LIB )
+  target_compile_definitions( SpecUtils PRIVATE SPECUTILS_STATIC_DEFINE )
+endif()
+
+
 set( SpecUtils_USE_FAST_FLOAT OFF )   # Uses https://github.com/fastfloat/fast_float .  If fast_float.h isnt found, will be fetched
 set( SpecUtils_USE_FROM_CHARS OFF )   # Supported by MSVC >= 2019, and gcc >= 12.  Not supported by Apple clang. In MSVC, about 50% slower than boost::spirit
 set( SpecUtils_USE_BOOST_SPIRIT OFF ) # Uses boost::spirit, and fasted method (maybe a hair faster than fastfloat)
@@ -480,7 +492,7 @@ configure_file(
 )
 LIST(APPEND headers ${SpecUtils_config_OUT})
 # Install the headers
-install(FILES ${headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SpecUtils)
+install(FILES ${headers} ${CMAKE_BINARY_DIR}/SpecUtilsExport.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SpecUtils)
 
 # Create and install the CMake package configuration files
 include(CMakePackageConfigHelpers)

SpecUtils/CubicSpline.h

@@ -49,7 +49,7 @@ namespace SpecUtils
    
    Where x_i and y_i are #CubicSplineNode::x and #CubicSplineNode::y respectively.
    */
-  struct SpecUtils_DLLEXPORT CubicSplineNode
+  struct SPECUTILS_EXPORT CubicSplineNode
   {
     /** The starting x-value of the interval. */
     double x;
@@ -72,7 +72,7 @@ namespace SpecUtils
    
    Will throw exception on error.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::vector<CubicSplineNode>
   create_cubic_spline( const std::vector<std::pair<float,float>> &data,
                        const DerivativeType left_bc_type,
@@ -87,7 +87,7 @@ namespace SpecUtils
    respectively (this is non-standard behavior for cubic splines, but how
    non-linear deviation pairs are defined).
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double eval_cubic_spline( const double x,
                            const std::vector<CubicSplineNode> &nodes );
 
@@ -97,7 +97,7 @@ namespace SpecUtils
    no duplicate x values (if there are duplicates, the one with the smallest
    y-value is used).
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::vector<CubicSplineNode>
   create_cubic_spline_for_dev_pairs( const std::vector<std::pair<float,float>> &dps );
 
@@ -113,7 +113,7 @@ namespace SpecUtils
    See #correction_due_to_dev_pairs for a functioned guaranteed to get you within
    0.0001 keV of the correct answer.
    */
-  SpecUtils_DLLEXPORT 
+  SPECUTILS_EXPORT 
   std::vector<CubicSplineNode>
   create_inverse_dev_pairs_cubic_spline( const std::vector<std::pair<float,float>> &dps );
 

SpecUtils/D3SpectrumExport.h

@@ -124,7 +124,7 @@ namespace D3SpectrumExport
 
   /** Specifies the options for a single spectrum displayed on the chart
    */
-  struct SpecUtils_DLLEXPORT D3SpectrumOptions
+  struct SPECUTILS_EXPORT D3SpectrumOptions
   {
     D3SpectrumOptions(); //black line, no peaks, scale factor 1.0
 
@@ -175,7 +175,7 @@ namespace D3SpectrumExport
    of those state values.
    
    */
-  struct SpecUtils_DLLEXPORT D3SpectrumChartOptions
+  struct SPECUTILS_EXPORT D3SpectrumChartOptions
   {
     D3SpectrumChartOptions();
     D3SpectrumChartOptions(  std::string title,

SpecUtils/DateTime.h

@@ -38,7 +38,7 @@ namespace  SpecUtils
    
    This is in analogy with boost::posix_time::ptime, that we upgraded the code from.
    */
-  SpecUtils_DLLEXPORT 
+  SPECUTILS_EXPORT 
   bool is_special( const time_point_t &t );
 
   //to_iso_string(...) and to_extended_iso_string(...) are implemented here
@@ -47,28 +47,28 @@ namespace  SpecUtils
   /** Converts the input time to an iso formatted string.
    Ex. "20140414T141201.621543"
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::string to_iso_string( const time_point_t &t );
 
   /** Converts the input time to an extended iso formatted string.
    Ex. "2014-04-14T14:12:01.621543"
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::string to_extended_iso_string( const time_point_t &t );
 
   /** Converts the input to string in format d-mmm-YYYY HH:MM:SS AM,
    where mmm is 3 char month name; d is day number with no leading zeros.
    Returns "not-a-date-time" if input is not valid.
    Ex. 24hr format: "9-Sep-2014 15:02:15", AM/PM: "9-Sep-2014 03:02:15 PM"
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::string to_common_string( const time_point_t &t, const bool twenty_four_hour );
 
   /** Converts input to the 23 character VAX format "DD-MMM-YYYY HH:MM:SS.SS".
    Returns empty string if input is not valid.
    Ex. "19-Sep-2014 14:12:01.62"
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::string to_vax_string( time_point_t t );
 
   /** \brief Describes how to attempt to parse date/times when it is ambigous,
@@ -114,7 +114,7 @@ namespace  SpecUtils
    
    Does not throw.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   time_point_t time_from_string( std::string time_string,
                                  const DateParseEndianType endian = DateParseEndianType::MiddleEndianFirst );
 
@@ -133,13 +133,13 @@ namespace  SpecUtils
    more complete implementation, but hasnt been tested against parsing spectrum
    files.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   float time_duration_string_to_seconds( const char *duration_str, const size_t length );
 
   /** Convenience function for getting time duration from a ISO 8601 like
    std::string.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   float time_duration_string_to_seconds( const std::string &duration );
 
   /** Converts a string formatted like "[-]h[h][:mm][:ss][.fff]", (ex. "02:15:01.332") to number of
@@ -159,7 +159,7 @@ namespace  SpecUtils
    
    Throws exception if input is invalid.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double delimited_duration_string_to_seconds( const std::string &duration );
 
   /** \brief Gives the CPU time in seconds.
@@ -169,7 +169,7 @@ namespace  SpecUtils
    
    \returns The CPU time in seconds, or on error -DBL_MAX.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double get_cpu_time();
 
 
@@ -182,7 +182,7 @@ namespace  SpecUtils
    Note May have an occasional jump of a few seconds on Windows due to a
    hardware issue (fixed on newer windows/hardware?)
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double get_wall_time();
 
 }//namespace  SpecUtils

SpecUtils/EnergyCalibration.h

@@ -99,7 +99,7 @@ namespace SpecUtils
    \TODO: move find_gamma_channel, gamma_energy_min/max, gamma_channel_width,
           gamma_channel_lower/upper/center, etc from #SpecUtils::Measurement to #EnergyCalibration
    */
-  struct SpecUtils_DLLEXPORT EnergyCalibration
+  struct SPECUTILS_EXPORT EnergyCalibration
   {
     /** @returns the energy calibration type. */
     EnergyCalType type() const;
@@ -320,7 +320,7 @@ namespace SpecUtils
           
    Throws exception if channels to combine is 0.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::shared_ptr<EnergyCalibration> energy_cal_combine_channels( const EnergyCalibration &orig_cal,
                                                                  const size_t num_channel_combine );
 
@@ -341,7 +341,7 @@ namespace SpecUtils
    
    Throws exception if an invalid energy calibration (i.e., channel energies not increasing)
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::shared_ptr< const std::vector<float> >
   polynomial_binning( const std::vector<float> &coeffs,
                      const size_t nchannel,
@@ -366,7 +366,7 @@ namespace SpecUtils
    
    Throws exception if an invalid energy calibration (i.e., channel energies not increasing)
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::shared_ptr< const std::vector<float> >
   fullrangefraction_binning( const std::vector<float> &coeffs,
                             const size_t nchannel,
@@ -388,7 +388,7 @@ namespace SpecUtils
    Doesnt perform a check that the coefficients or deviation pairs are actually valid.
    Throws exception if deviation pairs are not sorted.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double fullrangefraction_energy( const double channel_number,
                                  const std::vector<float> &coeffs,
                                  const size_t nchannel,
@@ -410,7 +410,7 @@ namespace SpecUtils
    
    Throws exception if deviation pairs are not sorted.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double polynomial_energy( const double channel_number,
                            const std::vector<float> &coeffs,
                            const std::vector<std::pair<float,float>> &deviation_pairs );
@@ -447,7 +447,7 @@ namespace SpecUtils
      be set at 1460 keV
    - Deviation pairs set to zero would be defined for 239 keV and 2614 keV
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double deviation_pair_correction( const double polynomial_energy,
                                       const std::vector<std::pair<float,float>> &dev_pairs );
 
@@ -467,7 +467,7 @@ namespace SpecUtils
          future this should be able to be made exactly accuate (within numerical
          limits anyway).
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double correction_due_to_dev_pairs( const double true_energy,
                                      const std::vector<std::pair<float,float>> &dev_pairs );
 
@@ -487,7 +487,7 @@ namespace SpecUtils
    Throws exception if resulting energy calibration wont be strictly increasing after applying
    deviation pair.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::shared_ptr<const std::vector<float>>
   apply_deviation_pair( const std::vector<float> &binning,
                         const std::vector<std::pair<float,float>> &dev_pairs );
@@ -519,7 +519,7 @@ namespace SpecUtils
    @returns the polynomial coefficients.  If input coefficients is empty or
             number of channels is zero, will return empty vector.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::vector<float>
   fullrangefraction_coef_to_polynomial( const std::vector<float> &coeffs,
                                         const size_t nchannel );
@@ -529,7 +529,7 @@ namespace SpecUtils
    the energy given by the equation is the middle of the channel (which is
    non-standard) to standard full range fraction equation coefficients.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::vector<float>
   mid_channel_polynomial_to_fullrangeFraction( const std::vector<float> &coeffs,
                                                const size_t nchannel );
@@ -541,7 +541,7 @@ namespace SpecUtils
   //  right. LowerChannelEdge type is check that each bin is increasing over
   //  previous, and that it has at least as many bins as nbin.
   //  InvalidEquationType always returns false.
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   bool calibration_is_valid( const EnergyCalType type,
                                    const std::vector<float> &eqn,
                                    const std::vector< std::pair<float,float> > &devpairs,
@@ -564,7 +564,7 @@ namespace SpecUtils
    Changes the polynomial calibration coefficients
    Would probably work for adding channels, but untested.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::vector<float>
   polynomial_cal_remove_first_channels( const int num_channels_remove,
                                         const std::vector<float> &orig_coefs );
@@ -594,7 +594,7 @@ namespace SpecUtils
    \TODO: Use #correction_due_to_dev_pairs to make it so algabraic approach can
           always be used.
   */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double find_fullrangefraction_channel( const double energy,
                                    const std::vector<float> &coeffs,
                                    const size_t nchannel,
@@ -624,7 +624,7 @@ namespace SpecUtils
      Note: that #correction_due_to_dev_pairs is used to correct for deviation pairs when using the,
      algebraic approach, and currently (20200820) may be correct to only 0.01 keV.
   */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   double find_polynomial_channel( const double energy,
                                  const std::vector<float> &coeffs,
                                  const size_t nchannel,
@@ -653,7 +653,7 @@ namespace SpecUtils
    
    Throw exception if any input has less than four channels.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   void rebin_by_lower_edge( const std::vector<float> &original_energies,
                            const std::vector<float> &original_counts,
                            const std::vector<float> &new_energies,
@@ -690,7 +690,7 @@ namespace SpecUtils
    #END
    \endverbatim
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   std::shared_ptr<EnergyCalibration> energy_cal_from_CALp_file( std::istream &input,
                                                                const size_t num_channels,
                                                                std::string &det_name );
@@ -711,7 +711,7 @@ namespace SpecUtils
    the original FRF coefficients will be written out after the other content - this is a InterSpec/SpecUtils specific extension of CALp file
    format.
    */
-  SpecUtils_DLLEXPORT
+  SPECUTILS_EXPORT
   bool write_CALp_file( std::ostream &output,
                         const std::shared_ptr<const EnergyCalibration> &cal,
                         const std::string &detector_name );