Advanced Computing Platform for Theoretical Physics

Commit 4bd7656f authored by Jana's avatar Jana
Browse files

Fixed several problems in cmake

parent 67a5715f
......@@ -461,7 +461,8 @@ if (HepMC3_FOUND)
TARGET_LINK_LIBRARIES (crmc ${HEPMC3_LIBRARIES})
if (Rivet_FOUND)
STRING (STRIP "${RIVET_LIB_DIR}" RIVET_LIBRARY_DIR)
TARGET_LINK_LIBRARIES (crmc ${RIVET_LIBRARY_DIR}/libRivet.so)
TARGET_LINK_LIBRARIES (crmc ${RIVET_LIBRARY_DIR}/libRivet.so)
TARGET_COMPILE_OPTIONS (crmc PUBLIC ${RIVET_CXXFLAGS})
endif(Rivet_FOUND)
endif(HepMC3_FOUND)
TARGET_LINK_LIBRARIES (crmc ${Boost_LIBRARIES})
......@@ -496,7 +497,7 @@ INSTALL (FILES ${TABSDIR} DESTINATION share/crmc/)
# install executable
if (__CRMCPROG__)
INSTALL (TARGETS crmc RUNTIME)
INSTALL (TARGETS crmc RUNTIME DESTINATION bin)
endif(__CRMCPROG__)
INSTALL (FILES ${CMAKE_BINARY_DIR}/src/epos.inc
src/epos.incems
......
......@@ -40,6 +40,9 @@ if (RIVET_DIR)
#set(RIVET_LIBRARIES ${RIVET_LIBRARY})
# mark_as_advanced(Rivet_FOUND)
string (REGEX REPLACE "\n$" "" RIVET_CXXFLAGS "${RIVET_CXXFLAGS}")
string (REPLACE " " ";" RIVET_CXXFLAGS "${RIVET_CXXFLAGS}")
SET(Rivet_FOUND TRUE)
......
......@@ -22,8 +22,8 @@ endif
ROOTCFLAGS = $(shell root-config --cflags)
ROOTLIBS = $(shell root-config --libs) -lEG
HEPCFLAGS = -I$(HepMC3_ROOT)/include
HEPLIBS = -L$(HepMC3_ROOT)/lib -lHepMC3
HEPCFLAGS = $(shell HepMC3-config --cflags)
HEPLIBS = $(HepMC3-config --ldflags)
BOOSTLIBS = -lboost_iostreams -lboost_system
CFLAGS = $(ROOTCFLAGS) $(HEPCFLAGS)
......@@ -35,7 +35,7 @@ OBJS=$(FILES:%.f=$(LIBDIR)%.o)
CXXOBJS=$(CXXFILES:%.cc=$(LIBDIR)%.o)
all: check dirs bin_dir bin/analysis
all: dirs bin_dir bin/analysis
.PHONY : check
check:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment