X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=CMakeLists.txt;h=d0307e613e8092aee3fdc8ade6fc16bdfd2862dc;hb=5ba7391eaa04df9f586d3a611d892511325305e8;hp=d876d162ed17b514d3fd3fdb83494ea4449c0336;hpb=e0e20c7056f2e4d2c3dfb56ec6899cb5fe3b01ea;p=u%2Fmrichter%2FAliRoot.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d876d162ed1..d0307e613e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,16 +27,24 @@ 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")
+# 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(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()
-set(CMAKE_INSTALL_PREFIX ${ALICE_INSTALL})
+
 
 # Environment for SHUTTLE
 set(DIMDIR $ENV{DIMDIR})
@@ -91,6 +99,10 @@ find_package(CPack)
 # ------------------------------
 find_package(ZeroMQ)
 
+# fastjet
+# ------------------------------
+find_package(FASTJET)
+
 #--------------------------------------------------------------------------------#
 # Environment/Compiler Configuration                                             #
 #--------------------------------------------------------------------------------#
@@ -311,7 +323,7 @@ set(AEXT a)
 set(LIBPATH ${CMAKE_BINARY_DIR}/lib/tgt_${ALICE_TARGET})
 set(BINPATH ${CMAKE_BINARY_DIR}/bin/tgt_${ALICE_TARGET})
 set(EXPORTDIR ${ALICE_ROOT}/include)
-set(BINLIBDIRS -L${ALICE_ROOT}/${LIBPATH})
+#set(BINLIBDIRS -L${ALICE_ROOT}/${LIBPATH})
 set(RAWDIRO ${CMAKE_BINARY_DIR}/RAW)
 set(ALIMDCSPECFILE ${RAWDIRO}/alimdc.spec)
 set(RAWDatabaseALIB ${LIBPATH}/libRAWDatabase.${AEXT})