Skip to content
Snippets Groups Projects
Commit 1aa3cd83 authored by Sergey Gorbunov's avatar Sergey Gorbunov
Browse files

load KFParticle package from a new official repository

parent 7e783226
No related branches found
No related tags found
1 merge request!201load KFParticle package from a new official repository
set(KFPARTICLE_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle${CMAKE_SHARED_LIBRARY_SUFFIX}") set(KFPARTICLE_LIBNAME "${CMAKE_SHARED_LIBRARY_PREFIX}KFParticle${CMAKE_SHARED_LIBRARY_SUFFIX}")
set(KFPARTICLE_SRC_URL "https://git.cbm.gsi.de/CbmSoft/KFParticle.git") set(KFPARTICLE_SRC_URL "https://github.com/cbmsw/KFParticle.git")
set(KFPARTICLE_DESTDIR "${CMAKE_BINARY_DIR}/external/KFPARTICLE-prefix") set(KFPARTICLE_DESTDIR "${CMAKE_BINARY_DIR}/external/KFPARTICLE-prefix")
# GIT_TAG is a hash for KFParticle tag cbm/v1.1-1
download_project_if_needed(PROJECT kfparticle_source download_project_if_needed(PROJECT kfparticle_source
GIT_REPOSITORY ${KFPARTICLE_SRC_URL} GIT_REPOSITORY ${KFPARTICLE_SRC_URL}
GIT_TAG "98712bbb2e2ae633e16a543ec38fea62a9ca2053" GIT_TAG "d4e22c8222cc6da877eefa453ade73d31d85e2e9"
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle
TEST_FILE CMakeLists.txt TEST_FILE CMakeLists.txt
PATCH_COMMAND "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/KFParticle.patch"
) )
If(ProjectUpdated) If(ProjectUpdated)
......
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fbd90c..5a131e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,11 +12,13 @@ macro(add_target_property _target _prop _value)
endmacro(add_target_property)
if (CMAKE_VERSION VERSION_LESS "3.1")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
-endif ()
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
+ endif ()
else ()
- set (CMAKE_CXX_STANDARD 11)
+ if(NOT CMAKE_CXX_STANDARD)
+ set (CMAKE_CXX_STANDARD 11)
+ endif()
endif ()
list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS} ${ROOTSYS})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment