From fefdd2941faf82c30ae785e173072df76c06bd55 Mon Sep 17 00:00:00 2001
From: JeremyMcCormick <jermccormick@gmail.com>
Date: Thu, 4 May 2017 20:24:45 -0700
Subject: [PATCH] use different variable name for ext dep github tags to not
interfere with find_package macro
---
cmake/InstallGDML.cmake | 6 +++---
cmake/InstallGeant4.cmake | 10 +++++-----
cmake/InstallLCDD.cmake | 6 +++---
cmake/InstallLCIO.cmake | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/cmake/InstallGDML.cmake b/cmake/InstallGDML.cmake
index 39b1c60..5f83529 100644
--- a/cmake/InstallGDML.cmake
+++ b/cmake/InstallGDML.cmake
@@ -1,5 +1,5 @@
-IF( NOT GDML_VERSION )
- SET( GDML_VERSION "master" )
+IF( NOT GDML_TAG )
+ SET( GDML_TAG "master" )
ENDIF()
EXTERNALPROJECT_ADD(
@@ -9,7 +9,7 @@ EXTERNALPROJECT_ADD(
DEPENDS XERCES Geant4
GIT_REPOSITORY "https://github.com/slaclab/gdml"
- GIT_TAG ${GDML_VERSION}
+ GIT_TAG ${GDML_TAG}
UPDATE_COMMAND ""
PATCH_COMMAND ""
diff --git a/cmake/InstallGeant4.cmake b/cmake/InstallGeant4.cmake
index fb78efb..6cfbbc0 100644
--- a/cmake/InstallGeant4.cmake
+++ b/cmake/InstallGeant4.cmake
@@ -1,8 +1,8 @@
-IF( NOT Geant4_VERSION )
- SET( Geant4_VERSION "v10.3.1" )
+IF( NOT Geant4_TAG )
+ SET( Geant4_TAG "v10.3.1" )
ENDIF()
-IF ( Geant4_VERSION EQUAL "master" )
+IF ( Geant4_TAG EQUAL "master" )
MESSAGE( FATAL_ERROR "Installing Geant4 from github master is not allowed." )
ENDIF()
@@ -14,7 +14,7 @@ EXTERNALPROJECT_ADD(
Geant4
GIT_REPOSITORY "https://github.com/Geant4/geant4"
- GIT_TAG ${GEANT4_VERSION}
+ GIT_TAG ${GEANT4_TAG}
UPDATE_COMMAND ""
PATCH_COMMAND ""
@@ -26,5 +26,5 @@ EXTERNALPROJECT_ADD(
BUILD_COMMAND make -j4
)
-STRING( REPLACE "v" "" Geant4_VERSION_NUMBER ${Geant4_VERSION} )
+STRING( REPLACE "v" "" Geant4_VERSION_NUMBER ${Geant4_TAG} )
SET( Geant4_DIR ${DEPENDENCY_INSTALL_DIR}/geant4/lib64/Geant4-${Geant4_VERSION_NUMBER} CACHE PATH "Geant4 install dir" FORCE )
diff --git a/cmake/InstallLCDD.cmake b/cmake/InstallLCDD.cmake
index 761fe15..a008110 100644
--- a/cmake/InstallLCDD.cmake
+++ b/cmake/InstallLCDD.cmake
@@ -1,5 +1,5 @@
-IF( NOT LCDD_VERSION )
- SET( LCDD_VERSION "master" )
+IF( NOT LCDD_TAG )
+ SET( LCDD_TAG "master" )
ENDIF()
EXTERNALPROJECT_ADD(
@@ -8,7 +8,7 @@ EXTERNALPROJECT_ADD(
DEPENDS XERCES Geant4 GDML
GIT_REPOSITORY "https://github.com/slaclab/lcdd"
- GIT_TAG ${LCDD_VERSION}
+ GIT_TAG ${LCDD_TAG}
UPDATE_COMMAND ""
PATCH_COMMAND ""
diff --git a/cmake/InstallLCIO.cmake b/cmake/InstallLCIO.cmake
index 84b14f8..dbe09a2 100644
--- a/cmake/InstallLCIO.cmake
+++ b/cmake/InstallLCIO.cmake
@@ -1,12 +1,12 @@
-IF( NOT LCIO_VERSION )
- SET( LCIO_VERSION "master" )
+IF( NOT LCIO_TAG )
+ SET( LCIO_TAG "master" )
ENDIF()
EXTERNALPROJECT_ADD(
LCIO
GIT_REPOSITORY "https://github.com/iLCSoft/LCIO"
- GIT_TAG ${LCIO_VERSION}
+ GIT_TAG ${LCIO_TAG}
UPDATE_COMMAND ""
PATCH_COMMAND ""
--
GitLab