Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lcgcmake
Manage
Activity
Members
Labels
Plan
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sft
lcgcmake
Merge requests
!327
Upgrade Geant4 version
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
Upgrade Geant4 version
SPI-1518
into
master
Overview
14
Commits
5
Pipelines
2
Changes
1
Closed
Pere Mato Vila
requested to merge
SPI-1518
into
master
5 years ago
Overview
14
Commits
5
Pipelines
2
Changes
1
Expand
Closes
SPI-1518
0
0
Merge request reports
Viewing commit
53ed825e
Prev
Next
Show latest version
1 file
+
22
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
53ed825e
ROOT with new oracle
· 53ed825e
Pere Mato Vila
authored
5 years ago
projects/patches/ROOT-6.18.04.patch
+
22
−
0
Options
@@ -43,3 +43,25 @@
TMVA
)
+target_include_directories(RMVA BEFORE PRIVATE ${R_INCLUDE_DIR})
From 41b424610d7c83b29869e841667617c2ef253f73 Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Thu, 3 Oct 2019 10:55:38 +0200
Subject: [PATCH] Fix FindOracle.cmake to find version 19.x
---
cmake/modules/FindOracle.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
index f09e7491954..e3ea87da5cd 100644
--- cmake/modules/FindOracle.cmake
+++ cmake/modules/FindOracle.cmake
@@ -55,7 +55,7 @@
FIND_LIBRARY(
)
FIND_LIBRARY(
ORACLE_LIBRARY_LNNZ
- NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 ociw32
+ NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 nnz18 nnz19 ociw32
PATHS ${ORACLE_LIB_LOCATION}
)
\ No newline at end of file
Loading