Page MenuHomeHEPForge
Files F8309835

No OneTemporary
Actions

View Options

diff --git a/cmake/NuWroSetup.cmake b/cmake/NuWroSetup.cmake
index 49e68d1..d4107ba 100644
--- a/cmake/NuWroSetup.cmake
+++ b/cmake/NuWroSetup.cmake
@@ -1,40 +1,53 @@
# Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
################################################################################
# This file is part of NUISANCE.
#
# NUISANCE is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# NUISANCE is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with NUISANCE. If not, see <http://www.gnu.org/licenses/>.
################################################################################
if(NOT DEFINED ENV{NUWRO})
cmessage(FATAL_ERROR "Environment variable NUWRO is not defined. "
"This must be set to point to a prebuilt NuWro instance.")
endif()
set(NUWRO $ENV{NUWRO})
-if(DEFINED USE_EXP AND USE_EXP)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNW_READHISTFROMINP")
-endif()
+# If you are using a version of NuWro without reweighting use this to compile.
+if(DEFINED NO_NuWro_RW AND NO_NuWro_RW)
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__NUWRO_ENABLED__ ")
+
+ set(RWENGINE_INCLUDE_DIRECTORIES ${NUWRO}/src)
+
+ set(RWENGINE_LINKER_FLAGS "${RWENGINE_LINKER_FLAGS} ${NUWRO}/bin/event1.so")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__NUWRO_ENABLED__ -D__NUWRO_REWEIGHT_ENABLED__ ")
+else()
-set(RWENGINE_INCLUDE_DIRECTORIES ${RWENGINE_INCLUDE_DIRECTORIES} ${NUWRO}/src ${NUWRO}/src/reweight ${NUWRO}/build/src)
+ if(DEFINED USE_EXP AND USE_EXP)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNW_READHISTFROMINP")
+ endif()
-set(RWENGINE_LINKER_FLAGS "${RWENGINE_LINKER_FLAGS} -L${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib -lreweight -levent")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__NUWRO_ENABLED__ -D__NUWRO_REWEIGHT_ENABLED__ ")
+
+ set(RWENGINE_INCLUDE_DIRECTORIES ${RWENGINE_INCLUDE_DIRECTORIES} ${NUWRO}/src ${NUWRO}/src/reweight ${NUWRO}/build/src)
+
+ set(RWENGINE_LINKER_FLAGS "${RWENGINE_LINKER_FLAGS} -L${NUWRO}/build/${CMAKE_SYSTEM_NAME}/lib -lreweight -levent")
+
+endif()
set(NEED_PYTHIA6 TRUE)
set(NEED_ROOTPYTHIA6 TRUE)

File Metadata

Mime Type
text/x-diff
Expires
Sat, Dec 21, 4:40 PM (22 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4023484
Default Alt Text
(2 KB)

Event Timeline