X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=CMakeLists.txt;h=eddf81a017e1036ab140c829558183f5c09e1389;hb=b001e589bbec81e65018cd5c0ebb2eb87aeae05e;hp=f794c8ebe45fa1c9052e2e41321b90370d903a3f;hpb=6a8ffaaa8af34cbac837bb9581b8b5049539dd0e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f794c8ebe45..eddf81a017e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,22 +27,25 @@ endif(NOT ALICE_ROOT)
 
 set(ALICE_INSTALL $ENV{ALICE_INSTALL})
 # Set AliRoot Installation directory 
-if(NOT ALICE_INSTALL)
-  message(STATUS "AliRoot files will be installed in ${ALICE_ROOT}. You can specify a different location by setting ALICE_INSTALL environment variable")
-  set(ALICE_INSTALL ${ALICE_ROOT})
-else()
-  message(STATUS "AliRoot files will be installed in ${ALICE_INSTALL}")
-endif(NOT ALICE_INSTALL)
-if(${ALICE_INSTALL} STREQUAL ${CMAKE_BINARY_DIR})
-  message(FATAL_ERROR "Install dir should be different from build dir")
-endif()
-
 # If CMAKE_INSTALL_PREFIX was not set than we set it to ALICE_INSTALL. 
 # If ALICE_INSTALL was not defined than it will default to source directory
-if(NOT CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX ${ALICE_INSTALL})
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    if(ALICE_INSTALL)
+	message(STATUS "AliRoot files will be installed in ${ALICE_INSTALL}")
+    else()
+	message(STATUS "AliRoot files will be installed in ${ALICE_ROOT}. You
+	can specify a different location by passing -DCMAKE_INSTALL_PREFIX or
+	by setting ALICE_INSTALL environment variable")
+	set(ALICE_INSTALL ${ALICE_ROOT})
+	if(${ALICE_INSTALL} STREQUAL ${CMAKE_BINARY_DIR})
+	    message(FATAL_ERROR "The install directory must differ from the
+	    build directory")
+	endif()
+    endif()
+    set(CMAKE_INSTALL_PREFIX ${ALICE_INSTALL} CACHE STRING "Install dir" FORCE)
 endif()
 
+
 # Environment for SHUTTLE
 set(DIMDIR $ENV{DIMDIR})
 set(ODIR $ENV{ODIR})
@@ -96,6 +99,10 @@ find_package(CPack)
 # ------------------------------
 find_package(ZeroMQ)
 
+# fastjet
+# ------------------------------
+find_package(FASTJET)
+
 #--------------------------------------------------------------------------------#
 # Environment/Compiler Configuration                                             #
 #--------------------------------------------------------------------------------#