Corrected define guard

[u/mrichter/AliRoot.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e5d9e9f2f1a4d69a6968570e29913ecd879f379..18cf1f8479db8c95083c99a268146134366932ee 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,24 +15,17 @@ cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 project(AliRoot CXX C Fortran)
 
 # Environment variables
-set(ALICE_ROOT $ENV{ALICE_ROOT})
 set(ALICE $ENV{ALICE})
-set(ALICE_INSTALL $ENV{ALICE_INSTALL})
-if(${ALICE_INSTALL} MATCHES ${CMAKE_BINARY_DIR})
-  message(FATAL_ERROR "Install dir should be different from build dir")
-endif(${ALICE_INSTALL} MATCHES ${CMAKE_BINARY_DIR})
-# Environment for SHUTTLE
-set(DIMDIR $ENV{DIMDIR})
-set(ODIR $ENV{ODIR})
-
 if(NOT ALICE)
   message(WARNING "Environment variable ALICE is not set")
 endif(NOT ALICE)
 
+set(ALICE_ROOT $ENV{ALICE_ROOT})
 if(NOT ALICE_ROOT)
   message(FATAL_ERROR "Please set ALICE_ROOT to the AliRoot source directory")
 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")
@@ -40,8 +33,15 @@ if(NOT ALICE_INSTALL)
 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()
 set(CMAKE_INSTALL_PREFIX ${ALICE_INSTALL})
 
+# Environment for SHUTTLE
+set(DIMDIR $ENV{DIMDIR})
+set(ODIR $ENV{ODIR})
+
 get_filename_component(PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}" REALPATH)
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 set(CPACK_COMPONENTS_ALL MDC)
@@ -87,6 +87,9 @@ find_package(AMORE)
 
 find_package(CPack)
 
+# ZeroMQ
+# ------------------------------
+find_package(ZeroMQ)
 
 #--------------------------------------------------------------------------------#
 # Environment/Compiler Configuration                                             #
@@ -180,6 +183,7 @@ if(Subversion_FOUND)
   string(REGEX MATCH "[^/]+$" ALIROOT_SVN_BRANCH ${ALIROOT_SVN_BRANCH})
 
   elseif(EXISTS ${PROJECT_SOURCE_DIR}/.git/ )
+    if(EXISTS ${PROJECT_SOURCE_DIR}/.git/svn/refs )
     execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND git svn info OUTPUT_VARIABLE OUTPUTVAR)
     string(REPLACE "\n" ";" OUTPUTVAR ${OUTPUTVAR})
     foreach(f ${OUTPUTVAR})
@@ -189,6 +193,20 @@ if(Subversion_FOUND)
        string(REGEX MATCH "[^: ]+$" ALIROOT_SVN_REVISION ${f})
       endif(${f} MATCHES URL)   
     endforeach()
+    else()
+      execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND git log -1 OUTPUT_VARIABLE OUTPUTVAR)
+      string(REPLACE "\n" ";" OUTPUTVAR ${OUTPUTVAR})
+      foreach(f ${OUTPUTVAR})
+        if(${f} MATCHES "^[ ]*git-svn-id:")
+          string(REGEX REPLACE "^.*/(.*)[@].*$" "\\1" ALIROOT_SVN_BRANCH "${f}" )
+          string(REGEX REPLACE "^.*/.*[@](.*) .*$" "\\1" ALIROOT_SVN_REVISION "${f}" )
+        endif(${f} MATCHES "^[ ]*git-svn-id:")
+      endforeach()
+      if(${ALIROOT_SVN_BRANCH}x STREQUAL "x")
+        set(ALIROOT_SVN_BRANCH "git clone")
+        set(ALIROOT_SVN_REVISION "-1")
+      endif(${ALIROOT_SVN_BRANCH}x STREQUAL "x")
+    endif(EXISTS ${PROJECT_SOURCE_DIR}/.git/svn/refs )
   endif(EXISTS ${PROJECT_SOURCE_DIR}/.svn/ )
 
   message(STATUS "Aliroot Revision - ${ALIROOT_SVN_REVISION} Branch - ${ALIROOT_SVN_BRANCH}")
@@ -457,6 +475,9 @@ install ( DIRECTORY OCDB
 install ( DIRECTORY QAref 
          DESTINATION . 
          PATTERN ".svn" EXCLUDE)
+install ( DIRECTORY GRP 
+         DESTINATION . 
+         PATTERN ".svn" EXCLUDE)
 
 #
 # EOF