From 8e7364b8f7dd3cee5bf90bdd84de6d21c048efe3 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Mon, 10 Oct 2016 09:29:53 -0700
Subject: [PATCH] changed git clone destination of C++GSL
to avoid conflicts with the other GSL (GNU Scientific Library)
---
CMakeLists.txt | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52038ff893..e26c8a2842 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,14 +14,15 @@ if(NOT GAUDI_USE_SYSTEM_CPP_GSL)
set(CPP_GSL_URL https://github.com/Microsoft/GSL)
set(CPP_GSL_VERSION 32ca283d)
message(STATUS "Using and shipping ${CPP_GSL_URL} version ${CPP_GSL_VERSION}")
- if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/GSL)
- execute_process(COMMAND git clone ${CPP_GSL_URL})
+ set(CPP_GSL_DIR ${CMAKE_CURRENT_BINARY_DIR}/ext/GSL)
+ if(NOT EXISTS ${CPP_GSL_DIR})
+ execute_process(COMMAND git clone ${CPP_GSL_URL} ${CPP_GSL_DIR})
endif()
execute_process(COMMAND git checkout ${CPP_GSL_VERSION}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GSL)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GSL/gsl DESTINATION include)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GSL/LICENSE DESTINATION include/gsl/LICENSE)
- set(CPP_GSL_INCLUDE_DIR NAMES ${CMAKE_CURRENT_BINARY_DIR}/GSL)
+ WORKING_DIRECTORY ${CPP_GSL_DIR})
+ install(DIRECTORY ${CPP_GSL_DIR}/gsl DESTINATION include)
+ install(FILES ${CPP_GSL_DIR}/LICENSE DESTINATION include/gsl/LICENSE)
+ set(CPP_GSL_INCLUDE_DIR NAMES ${CPP_GSL_DIR})
else()
find_path(CPP_GSL_INCLUDE_DIR NAMES gsl/gsl)
endif()
--
GitLab