From 9bd66b31f5434238a88a014f85a9e336beaf78e7 Mon Sep 17 00:00:00 2001 From: Martin Urban <unknown> Date: Fri, 22 May 2015 15:41:59 +0200 Subject: [PATCH] Fixed typo and remove unneeded Message --- CMakeLists.txt | 4 +--- FindPythia8.cmake | 38 -------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 FindPythia8.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index ef75ca6..2894c18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,7 @@ SET(PXLMODULENAME Pythia8Module) #check for pxl FIND_PACKAGE(PXL REQUIRED astro core hep modules) FIND_PACKAGE(PkgConfig) -pkg_check_modules(PYTHIA8 REQUIRED pythia8) - -MESSAGE( STATUS "PYTHIA8_LIBRARIES " ${PYTHIA8_LIBRARIES}) +pkg_check_modules(PYTHIA8 REQUIRED Pythia8) #add additional external libraries as needed include_directories( diff --git a/FindPythia8.cmake b/FindPythia8.cmake deleted file mode 100644 index 2f8562d..0000000 --- a/FindPythia8.cmake +++ /dev/null @@ -1,38 +0,0 @@ -# - Try to find Pythia8 -# Once done, this will define -# -# Pythia8_FOUND - system has Pythia8 -# Pythia8_INCLUDE_DIRS - the Pythia8 include directories -# Pythia8_LIBRARIES - link these to use Pythia8 -# Note that this only configures the Pythia8-core system to add a Pythia8 -# plugin, use the Pythia8_ADD_PLUGIN(name), where name is e.g. Pythia8-astro - - -# Use pkg-config to get hints about paths -FIND_PACKAGE(PkgConfig) -if (PKG_CONFIG_FOUND) - pkg_check_modules(Pythia8_PKGCONF Pythia8) - SET(Pythia8_PLUGIN_INSTALL_PATH $ENV{HOME}/${Pythia8_PLUGIN_INSTALL_PATH}) -endif (PKG_CONFIG_FOUND) - -#In order to get Pythia8 to work, the environment variable PYTHIA8DATA has to point to "<Pythia8_ROOT>/xmldoc". -#Use this information to optain the root directory of a working Pythia8 installation. -get_filename_component(Pythia8_ROOT $ENV{PYTHIA8DATA} PATH) - -# Include dir -find_path(Pythia8_INCLUDE_DIRS - NAMES Pythia.h - HINTS ${Pythia8_PKGCONF_INCLUDE_DIRS} ${Pythia8_ROOT} /usr/local/include /Users/jan/Software/pythia8165/include/ - PATH_SUFFIXES include includes lib libs -) - -# library -find_library(Pythia8_LIBRARIES - NAMES pythia8 - HINTS ${Pythia8_PKGCONF_LIBRARY_DIRS} ${Pythia8_ROOT} /usr/local/lib /Users/jan/Software/pythia8165/lib/ - PATH_SUFFIXES include includes lib libs -) - - - - -- GitLab