Skip to content
Snippets Groups Projects
Commit fefdd294 authored by JeremyMcCormick's avatar JeremyMcCormick
Browse files

use different variable name for ext dep github tags to not interfere with find_package macro

parent cd0c75de
No related branches found
No related tags found
No related merge requests found
IF( NOT GDML_VERSION ) IF( NOT GDML_TAG )
SET( GDML_VERSION "master" ) SET( GDML_TAG "master" )
ENDIF() ENDIF()
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
...@@ -9,7 +9,7 @@ EXTERNALPROJECT_ADD( ...@@ -9,7 +9,7 @@ EXTERNALPROJECT_ADD(
DEPENDS XERCES Geant4 DEPENDS XERCES Geant4
GIT_REPOSITORY "https://github.com/slaclab/gdml" GIT_REPOSITORY "https://github.com/slaclab/gdml"
GIT_TAG ${GDML_VERSION} GIT_TAG ${GDML_TAG}
UPDATE_COMMAND "" UPDATE_COMMAND ""
PATCH_COMMAND "" PATCH_COMMAND ""
......
IF( NOT Geant4_VERSION ) IF( NOT Geant4_TAG )
SET( Geant4_VERSION "v10.3.1" ) SET( Geant4_TAG "v10.3.1" )
ENDIF() ENDIF()
IF ( Geant4_VERSION EQUAL "master" ) IF ( Geant4_TAG EQUAL "master" )
MESSAGE( FATAL_ERROR "Installing Geant4 from github master is not allowed." ) MESSAGE( FATAL_ERROR "Installing Geant4 from github master is not allowed." )
ENDIF() ENDIF()
...@@ -14,7 +14,7 @@ EXTERNALPROJECT_ADD( ...@@ -14,7 +14,7 @@ EXTERNALPROJECT_ADD(
Geant4 Geant4
GIT_REPOSITORY "https://github.com/Geant4/geant4" GIT_REPOSITORY "https://github.com/Geant4/geant4"
GIT_TAG ${GEANT4_VERSION} GIT_TAG ${GEANT4_TAG}
UPDATE_COMMAND "" UPDATE_COMMAND ""
PATCH_COMMAND "" PATCH_COMMAND ""
...@@ -26,5 +26,5 @@ EXTERNALPROJECT_ADD( ...@@ -26,5 +26,5 @@ EXTERNALPROJECT_ADD(
BUILD_COMMAND make -j4 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 ) SET( Geant4_DIR ${DEPENDENCY_INSTALL_DIR}/geant4/lib64/Geant4-${Geant4_VERSION_NUMBER} CACHE PATH "Geant4 install dir" FORCE )
IF( NOT LCDD_VERSION ) IF( NOT LCDD_TAG )
SET( LCDD_VERSION "master" ) SET( LCDD_TAG "master" )
ENDIF() ENDIF()
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
...@@ -8,7 +8,7 @@ EXTERNALPROJECT_ADD( ...@@ -8,7 +8,7 @@ EXTERNALPROJECT_ADD(
DEPENDS XERCES Geant4 GDML DEPENDS XERCES Geant4 GDML
GIT_REPOSITORY "https://github.com/slaclab/lcdd" GIT_REPOSITORY "https://github.com/slaclab/lcdd"
GIT_TAG ${LCDD_VERSION} GIT_TAG ${LCDD_TAG}
UPDATE_COMMAND "" UPDATE_COMMAND ""
PATCH_COMMAND "" PATCH_COMMAND ""
......
IF( NOT LCIO_VERSION ) IF( NOT LCIO_TAG )
SET( LCIO_VERSION "master" ) SET( LCIO_TAG "master" )
ENDIF() ENDIF()
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
LCIO LCIO
GIT_REPOSITORY "https://github.com/iLCSoft/LCIO" GIT_REPOSITORY "https://github.com/iLCSoft/LCIO"
GIT_TAG ${LCIO_VERSION} GIT_TAG ${LCIO_TAG}
UPDATE_COMMAND "" UPDATE_COMMAND ""
PATCH_COMMAND "" PATCH_COMMAND ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment