From 43500bd400f0e569ea292ed6346b86dde8141a5a Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Mon, 27 Jun 2011 22:24:23 +0000
Subject: [PATCH] From Pere: a couple of minor changes to make standalone
compilation of TMVA and RooFit work.
git-svn-id: http://root.cern.ch/svn/root/trunk@40054 27541ba8-7e3a-0410-8455-c3a389f83636
---
cmake/modules/StandaloneBuild.cmake | 12 ++++++------
tmva/CMakeLists.txt | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cmake/modules/StandaloneBuild.cmake b/cmake/modules/StandaloneBuild.cmake
index 7f1ea44c2b6..3f0bd1c1cf8 100644
--- a/cmake/modules/StandaloneBuild.cmake
+++ b/cmake/modules/StandaloneBuild.cmake
@@ -35,12 +35,12 @@ include_directories(${ROOT_INCLUDE_DIRS})
link_directories(${ROOT_LIBRARY_DIRS})
#---Configure and general additional files -------------------------------------------------------
-configure_file(${ROOTSYS}/cmake/modules/thisprojectsh.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.sh @ONLY)
-configure_file(${ROOTSYS}/cmake/modules/thisprojectcsh.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.csh @ONLY)
-install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.sh
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.csh
- PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ
- DESTINATION bin)
+#configure_file(${ROOTSYS}/cmake/modules/thisprojectsh.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.sh @ONLY)
+#configure_file(${ROOTSYS}/cmake/modules/thisprojectcsh.in ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.csh @ONLY)
+#install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.sh
+# ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/this${CMAKE_PROJECT_NAME}.csh
+# PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ
+# DESTINATION bin)
diff --git a/tmva/CMakeLists.txt b/tmva/CMakeLists.txt
index 140838226fd..aef55a5f3ee 100644
--- a/tmva/CMakeLists.txt
+++ b/tmva/CMakeLists.txt
@@ -58,7 +58,7 @@ ROOT_GENERATE_DICTIONARY(G__TMVA4 ${theaders4} LINKDEF LinkDef4.h)
ROOT_GENERATE_ROOTMAP(TMVA LINKDEF LinkDef1.h LinkDef2.h LinkDef3.h LinkDef4.h
DEPENDENCIES RIO Hist Matrix Tree Graf Gpad TreePlayer MLP Minuit MathCore XMLIO)
-ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA1.cxx G__TMVA2.cxx G__TMVA3.cxx G__TMVA4.cxx LIBRARIES Core Cint
+ROOT_LINKER_LIBRARY(TMVA *.cxx G__TMVA1.cxx G__TMVA2.cxx G__TMVA3.cxx G__TMVA4.cxx CMAKENOEXPORT LIBRARIES Core Cint
DEPENDENCIES RIO Hist Tree MLP Minuit XMLIO)
install(DIRECTORY inc/TMVA/ DESTINATION include/TMVA
--
GitLab