ignore old build variables as they are unimportant now

FlexibleSUSY · Mar 28, 2018 · b472c5b · b472c5b
1 parent 00e0f12
commit b472c5b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 68 deletions.
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
@@ -3,7 +3,7 @@ string(TIMESTAMP DATE "%a %d %b %Y %H:%M:%SZ UTC" UTC)
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_COMMIT)
 
-configure_file(config_cmake.h.in config.h)
+configure_file(config_cmake.h.in config.h @ONLY)
 
 add_library(config INTERFACE)
 target_include_directories(config INTERFACE "${CMAKE_CURRENT_BINARY_DIR}")

diff --git a/config/config_cmake.h.in b/config/config_cmake.h.in
@@ -6,56 +6,28 @@
 
 #define PKGNAME "@PROJECT_NAME@"
 
-#define FLEXIBLESUSY_VERSION  "@FlexibleSUSY_VERSION@"
-#define FLEXIBLESUSY_MAJOR    @FlexibleSUSY_VERSION_MAJOR@
-#define FLEXIBLESUSY_MINOR    @FlexibleSUSY_VERSION_MINOR@
-#define FLEXIBLESUSY_PATCH    @FlexibleSUSY_VERSION_PATCH@
-#define FLEXIBLESUSY_EXTRA    @FlexibleSUSY_VERSION_TWEAK@
+#define FLEXIBLESUSY_VERSION  "@PROJECT_VERSION@"
+#define FLEXIBLESUSY_MAJOR    @PROJECT_VERSION_MAJOR@
+#define FLEXIBLESUSY_MINOR    @PROJECT_VERSION_MINOR@
+#define FLEXIBLESUSY_PATCH    @PROJECT_VERSION_PATCH@
+#define FLEXIBLESUSY_EXTRA    @PROJECT_VERSION_TWEAK@
 #define GIT_COMMIT            "@GIT_COMMIT@"
 
+#define BOOST_VERSION         @Boost_VERSION@
+#define EIGEN_VERSION         "@EIGEN3_VERSION@"
+#define GM2CALC_VERSION       "@GM2CALC_VERSION@"
+#define GSL_VERSION           "@GSL_VERSION@"
+#define HIMALAYA_VERSION      "@HIMALAYA_VERSION@"
+#define MATHEMATICA_VERSION   "@Mathematica_VERSION@"
 #define SARAH_VERSION         "@SARAH_VERSION@"
 #define SARAH_MAJOR           @SARAH_MAJOR@
 #define SARAH_MINOR           @SARAH_MINOR@
 #define SARAH_PATCH           @SARAH_PATCH@
 
-#define MATHEMATICA_VERSION   "@Mathematica_VERSION@"
-
-#define GM2CALC_VERSION       "@GM2CALC_VERSION@"
-#define HIMALAYA_VERSION      "@HIMALAYA_VERSION@"
-
 /* System information */
 #define OPERATING_SYSTEM      "@CMAKE_SYSTEM_NAME@"
 #define KERNEL_VERSION        "@CMAKE_SYSTEM_VERSION@"
 
-/* Build variables */
-#define BLASLIBS              "@BLASLIBS@"
-#define BOOSTFLAGS            "@BOOSTFLAGS@"
-#define BOOSTTESTLIBS         "@BOOSTTESTLIBS@"
-#define BOOSTTHREADLIBS       "@BOOSTTHREADLIBS@"
-#define CPPFLAGS              "@CPPFLAGS@"
-#define CXX                   "@CMAKE_CXX_COMPILER@"
-#define CXXFLAGS              "@CMAKE_CXX_FLAGS@"
-#define EIGENFLAGS            "@EIGEN3_INCLUDE_DIR@"
-#define FC                    "@FC@"
-#define FFLAGS                "@FFLAGS@"
-#define FLIBS                 "@FLIBS@"
-#define HIMALAYAFLAGS         "@HIMALAYAFLAGS@"
-#define HIMALAYALIBS          "@HIMALAYALIBS@"
-#define GSLFLAGS              "@GSLFLAGS@"
-#define GSLLIBS               "@GSLLIBS@"
-#define LAPACKLIBS            "@LAPACKLIBS@"
-#define LDFLAGS               "@CMAKE_MODULE_LINKER_FLAGS@"
-#define LDLIBS                "@LDLIBS@"
-#define LLFLAGS               "@LLFLAGS@"
-#define LLLIBS                "@LLLIBS@"
-#define LOOPFUNCFLAGS         "@LOOPFUNCFLAGS@"
-#define LOOPFUNCLIBS          "@LOOPFUNCLIBS@"
-#define SQLITELIBS            "@SQLITELIBS@"
-#define SQLITEFLAGS           "@SQLITEFLAGS@"
-#define THREADLIBS            "@THREADLIBS@"
-#define TSILLIBS              "@TSILLIBS@"
-#define TSILFLAGS             "@TSILFLAGS@"
-
 /* Switches */
 
 /* Enable colored printout */

diff --git a/fflite/CMakeLists.txt b/fflite/CMakeLists.txt
@@ -18,6 +18,6 @@ else()
   add_library(fflite INTERFACE)
 endif()
 
-target_include_directories(fflite PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+target_include_directories(fflite INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_library(FlexibleSUSY::fflite ALIAS fflite)
diff --git a/src/build_info.cpp b/src/build_info.cpp
@@ -76,33 +76,6 @@ void print_version_info(std::ostream& ostr)
 void print_build_info(std::ostream& ostr)
 {
    ostr <<
-      "C++ compiler (CXX):                     " CXX "\n"
-      "C++ compiler flags (CXXFLAGS):          " CXXFLAGS "\n"
-      "C preprocessor flags (CPPFLAGS):        " CPPFLAGS "\n"
-      "Fortran compiler (FC):                  " FC "\n"
-      "Fortran compiler flags (FFLAGS):        " FFLAGS "\n"
-      "Fortran libraries (FLIBS):              " FLIBS "\n"
-      "BLAS library (BLASLIBS):                " BLASLIBS "\n"
-      "Boost flags (BOOSTFLAGS):               " BOOSTFLAGS "\n"
-      "Boost libraries:                        " BOOSTTESTLIBS " " BOOSTTHREADLIBS "\n"
-      "Eigen flags (EIGENFLAGS):               " EIGENFLAGS "\n"
-      "Himalaya flags (HIMALAYAFLAGS):         " HIMALAYAFLAGS "\n"
-      "Himalaya libraries (HIMALAYALIBS):      " HIMALAYALIBS "\n"
-      "GSL flags (GSLFLAGS):                   " GSLFLAGS "\n"
-      "GSL libraries (GSLLIBS):                " GSLLIBS "\n"
-      "LAPACK library (LAPACKLIBS):            " LAPACKLIBS "\n"
-      "LibraryLink flags (LLFLAGS):            " LLFLAGS "\n"
-      "LibraryLink library (LLLIBS):           " LLLIBS "\n"
-      "Loop function flags (LOOPFUNCFLAGS):    " LOOPFUNCFLAGS "\n"
-      "Loop function libraries (LOOPFUNCLIBS): " LOOPFUNCLIBS "\n"
-      "Additional flags (LDFLAGS):             " LDFLAGS "\n"
-      "Additional libraries (LDLIBS):          " LDLIBS "\n"
-      "SQLite3 flags (SQLITEFLAGS):            " SQLITEFLAGS "\n"
-      "SQLite3 libraries (SQLITELIBS):         " SQLITELIBS "\n"
-      "TSIL flags (TSILFLAGS):                 " TSILFLAGS "\n"
-      "TSIL libraries (TSILLIBS):              " TSILLIBS "\n"
-      "Thread libraries (THREADLIBS):          " THREADLIBS "\n"
-      "\n"
       "Two-scale solver:                       "
 #ifdef ENABLE_TWO_SCALE_SOLVER
       "enabled"