Commit b0a8c36c authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_3_1_1'

parents e7c69daf 77158fa1
......@@ -31,7 +31,7 @@ cmake_minimum_required(VERSION 2.6)
# project name
project(CLHEP)
set( VERSION 2.3.1.0 )
set( VERSION 2.3.1.1 )
# If Policy CMP0042 exists, use OLD to prefer the use of install names
# instead of the new @rpath default.
......
......@@ -3,39 +3,24 @@
#ifndef @UPACKAGE@_DEFS_H
#define @UPACKAGE@_DEFS_H
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
2015-11-10 Lynn Garren <garren@fnal.gov>
* Add explicit support for the Intel compiler
2015-11-04 Lynn Garren <garren@fnal.gov>
* make sure all generated defs.h headers use unique variable names
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
......
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
==============================
......
......@@ -3,39 +3,24 @@
#ifndef @UPACKAGE@_DEFS_H
#define @UPACKAGE@_DEFS_H
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
==============================
......
......@@ -3,39 +3,24 @@
#ifndef @UPACKAGE@_DEFS_H
#define @UPACKAGE@_DEFS_H
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
==============================
......
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
==============================
......
......@@ -3,39 +3,24 @@
#ifndef @UPACKAGE@_DEFS_H
#define @UPACKAGE@_DEFS_H
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
==============================
......
......@@ -3,39 +3,24 @@
#ifndef @UPACKAGE@_DEFS_H
#define @UPACKAGE@_DEFS_H
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
==============================
......
......@@ -8,39 +8,24 @@
#define DISABLE_ALLOC
#endif
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
......
......@@ -6,39 +6,24 @@
/* Define to 1 if you have the `drand48' function. */
@DRAND48_DEF@
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
==============================
......
......@@ -3,39 +3,24 @@
#ifndef @UPACKAGE@_DEFS_H
#define @UPACKAGE@_DEFS_H
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
......@@ -3,39 +3,24 @@
#ifndef @UPACKAGE@_DEFS_H
#define @UPACKAGE@_DEFS_H
/* Name of package */
#ifndef PACKAGE
#define PACKAGE "@PACKAGE@"
#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef PACKAGE_BUGREPORT
#define PACKAGE_BUGREPORT "http://savannah.cern.ch/projects/clhep/"
#ifndef CLHEP_@UPACKAGE@_BUGREPORT
#define CLHEP_@UPACKAGE@_BUGREPORT "http://proj-clhep.web.cern.ch/proj-clhep/"
#endif
/* Define to the full name of this package. */
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "@PROJECT_NAME@ @PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_NAME
#define CLHEP_@UPACKAGE@_NAME "@PROJECT_NAME@ @PACKAGE@"
#endif
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
#define PACKAGE_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the one symbol short name of this package. */
#ifndef PACKAGE_TARNAME
#define PACKAGE_TARNAME "@PACKAGE@"
#ifndef CLHEP_@UPACKAGE@_STRING
#define CLHEP_@UPACKAGE@_STRING "@PROJECT_NAME@ @PACKAGE@ @VERSION@"
#endif
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
#define PACKAGE_VERSION "@VERSION@"
#endif
/* Version number of package */
#ifndef VERSION
#define VERSION "@VERSION@"
#ifndef CLHEP_@UPACKAGE@_VERSION
#define CLHEP_@UPACKAGE@_VERSION "@VERSION@"
#endif
#endif // @UPACKAGE@_DEFS_H
==============================
10.11.15 Release CLHEP-2.3.1.1
==============================
==============================
03.11.15 Release CLHEP-2.3.1.0
==============================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment