DARPM enables automatically DA

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 720aa5ea6acb5dc6eefd7d56ad262acfea4efe23..1838b7bdfb4637cf7ad5be2e66e83c01e9c05941 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,6 +90,13 @@ if(AMORE_CONFIG)
     endif()
 endif(AMORE_CONFIG)
 
+# id DARPM we enable DA if it is not set
+if(DARPM)
+    if(NOT DA)
+        set(DA ON)
+    endif(NOT DA)
+endif(DARPM)
+
 # DA is enabled
 if(DA)
     if(NOT DIMDIR AND NOT ODIR)

diff --git a/INSTALLDA.txt b/INSTALLDA.txt
index fd5490d6191e9f927159b42d3dc86cd1aa9ef0b8..8d1941062ccb3030ea6c3103c7df1db5eb895a74 100644 (file)
--- a/INSTALLDA.txt
+++ b/INSTALLDA.txt
@@ -109,6 +109,9 @@ DAs build and rpm creation are enabled through the cmake configuration parameter
     -DDA=ON
     -DARPM=ON
 
+DA set to ON will enable only the build of the DAs, but not the creation of the RPMs
+If DARPM is set to ON than DA is automatically enabled.
+
 The mandatory requirements have to be specified
     -DAMORE_CONFIG=PATH_TO_amore-config
     -DDATE_CONFIG=PATH_TO_date-config

diff --git a/cmake/FindFASTJET.cmake b/cmake/FindFASTJET.cmake
index be99e1f743db53a578f62fad746997c1591dd463..bd3c1efb71370163f18b7836e03a6436e13d0c2b 100644 (file)
--- a/cmake/FindFASTJET.cmake
+++ b/cmake/FindFASTJET.cmake
@@ -56,7 +56,11 @@ if(FASTJET)
     string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" FASTJET_VERSION_PATCH "${FASTJET_VERSION}")
     
     if(FASTJET_VERSION_MAJOR LESS 3)
-        message(FATAL_ERROR "FastJet ${FASTJET_VERSION_MAJOR}.${FASTJET_VERSION_MINOR}.${FASTJET_VERSION_PATCH} version is not suported. Please install a version >= 3.*")
+        message(FATAL_ERROR "FastJet ${FASTJET_VERSION_MAJOR}.${FASTJET_VERSION_MINOR}.${FASTJET_VERSION_PATCH} version is not suported. Please install a version >= 3.0.*")
+    endif()
+    
+    if(FASTJET_VERSION_MINOR NOT EQUAL 0)
+        message(FATAL_ERROR "FastJet ${FASTJET_VERSION_MAJOR}.${FASTJET_VERSION_MINOR}.${FASTJET_VERSION_PATCH} version is not suported.  Please install a version >= 3.0.*")
     endif()
 
     # Extracting compilation flags