Trigger option for pp and pPB

[u/mrichter/AliRoot.git] / cmake / FindAMORE.cmake

diff --git a/cmake/FindAMORE.cmake b/cmake/FindAMORE.cmake
index 5287bdddcfefe5bc277ea15e09201aa71ea25736..56b7df43695f42df567cfeb327de3560a145c6b6 100644 (file)
--- a/cmake/FindAMORE.cmake
+++ b/cmake/FindAMORE.cmake
@@ -3,21 +3,22 @@
 # Author: Johny Jose (johny.jose@cern.ch)
 #         Port of previous Makefile build to cmake
 
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 
 find_program(AMORE_CONFIG NAMES amore-config)
 if(AMORE_CONFIG)
   set(AMORE_FOUND TRUE)
   set(AMOREDEFINITIONS "-DALI_AMORE")
   execute_process(COMMAND ${AMORE_CONFIG} --cflags --includes OUTPUT_VARIABLE AMOREFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND ${AMORE_CONFIG} --ldflags-da-static OUTPUT_VARIABLE _lddaflags OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND ${AMORE_CONFIG} --ldflags --ldflags-da-static --libs OUTPUT_VARIABLE _lddaflags OUTPUT_STRIP_TRAILING_WHITESPACE)
   ALICE_CleanOutput(_lddaflags "${_lddaflags}")
+  set(AMOREFLAGS "-DALI_AMORE ${AMOREFLAGS}")
   if(DATE_FOUND)
     execute_process(COMMAND ${DATE_CONFIG} --rcproxylibs OUTPUT_VARIABLE _rcproxylib OUTPUT_STRIP_TRAILING_WHITESPACE)
   else()
     message(STATUS "AMORE requires DATE")
   endif(DATE_FOUND)
   set(AMOREDALIBS "-static ${_lddaflags} ${_rcproxylib}")
-else()
+  else()
   message(STATUS "AMORE not found")
 endif(AMORE_CONFIG)