Changeset 19010 for trunk/Mars

Timestamp:

04/27/18 20:29:14 (6 years ago)

Author:

tbretz

Message:

Updated the header, project and version definition, added help2man, fixed Wformat=1 which is Wformat in clang, some simplification.

File:

• trunk/Mars/CMakeLists.txt (modified) (5 diffs)

trunk/Mars/CMakeLists.txt

@@ -1 @@
-# ------------ cmake --------------
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR)
+# *********************************
+# ************ cmake **************
+# *********************************
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_POLICY(SET CMP0043 NEW)
 CMAKE_POLICY(SET CMP0048 NEW)
 
@@ -10 +13 @@
 # (you can also set it on the command line: -D CMAKE_BUILD_TYPE=Release)
 
-# --------- Project --------------
-PROJECT(Mars VERSION 1.8.3.13)
-
-# ------- For config.h.in --------
-SET(PACKAGE_MAINTAINER "Thomas Bretz")
-SET(PACKAGE_BUGREPORT  "tbretz@physik.rwth-aachen.de")
-#SET(PACKAGE_URL        "")
+# Enable CLANG as default compilers, to change this use
+# cmake -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=c++
+# Note that if compilers are switched on the fly,
+# the cache is deleted
+
+IF (NOT DEFINED CMAKE_C_COMPILER)
+        SET(CMAKE_C_COMPILER   "clang")#   CACHE STRING "Choose the compiler (c++, g++, clang++)" FORCE)
+ENDIF()
+#
+IF (NOT DEFINED CMAKE_CXX_COMPILER)
+        SET(CMAKE_CXX_COMPILER "clang++")# CACHE STRING "Choose the compiler (c++, g++, clang++)" FORCE)
+ENDIF()
 
 #SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -25 +33 @@
 #CHECK_TYPE_SIZE("int"   SIZEOF_INT)
 
+
+
+# *********************************
+# ************ Project ************
+# *********************************
+
+STRING(TIMESTAMP VERSION %y.%U.%w.%H UTC)
+
+MESSAGE(STATUS "Mars V${VERSION}")
+
+PROJECT(mars VERSION ${VERSION})
+
+INCLUDE(GNUInstallDirs)
+
+# ======== For config.h.in =========
+SET(PACKAGE_MAINTAINER "Thomas Bretz")
+SET(PACKAGE_BUGREPORT  "tbretz@physik.rwth-aachen.de")
+SET(PACKAGE_URL        "https://git.rwth-aachen.de/tbretz/bd/wikis/home")
+
+
+
+# *********************************
+# ********* Requirements **********
+# *********************************
+
+# =========== help2man ============
+FIND_PROGRAM(HELP2MAN_EXECUTABLE help2man)
+
 # =========== pkg-config ============
 FIND_PACKAGE(PkgConfig)
@@ -62 +98 @@
 SET(CMAKE_CXX_FLAGS
         "${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
-         -Wcast-align -Wformat=1 -Woverloaded-virtual \
+         -Wcast-align -Wformat -Woverloaded-virtual \
          -Wnon-virtual-dtor -Wshadow -fPIC") # -Wextra
 
@@ -206 +242 @@
         OPTIONS -p -D__MARS__ -DHAVE_ZLIB)
 
-ADD_LIBRARY(mars SHARED dictionary/MARS.cxx)
-TARGET_LINK_LIBRARIES(mars ${ROOT_LIBRARIES})
-TARGET_LINK_LIBRARIES(mars ${NOVA_LIBRARY})
-TARGET_LINK_LIBRARIES(mars ZLIB::ZLIB)
+ADD_LIBRARY(mars SHARED dictionary/MARS.cxx) # CMAKE_POSITION_INDEPENDENT_CODE
+TARGET_LINK_LIBRARIES(mars
+        ZLIB::ZLIB
+        ${NOVA_LIBRARY}
+        ${ROOT_LIBRARIES})
+
 
 FOREACH(DIR ${DIRECTORIES})