From 5ffb9f46ba448da399713dff274c977d43ee747e Mon Sep 17 00:00:00 2001 From: Jean-Francois SMIGIELSKI Date: Thu, 19 Mar 2015 16:18:19 +0100 Subject: [PATCH] cmake: now uses the standard CMAKE_INSTALL_PREFIX --- CMakeLists.txt | 7 ------- gridinit.conf | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cd1976..3442c28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,6 @@ set(CMAKE_C_FLAGS_DEBUG "-O0 -fno-inline") set(CMAKE_C_FLAGS_RELEASE "-O2") set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -fno-inline") set(CMAKE_C_FLAGS_MINSIZEREL "-Os") -set(CMAKE_INSTALL_PREFIX "/usr/local") add_definitions(-D_REENTRANT) add_definitions(-D_LARGE_FILES) @@ -84,12 +83,6 @@ else() MESSAGE("LD_LIBDIR guessed to ${LD_LIBDIR}") endif() -if (PREFIX) - set(CMAKE_INSTALL_PREFIX ${PREFIX}) -endif (PREFIX) - -message(STATUS "Installation prefix : ${CMAKE_INSTALL_PREFIX}") - ###-------------------------------------------------------------------------### find_package(PkgConfig) diff --git a/gridinit.conf b/gridinit.conf index c1e119f..be3807f 100644 --- a/gridinit.conf +++ b/gridinit.conf @@ -49,11 +49,11 @@ limit.stack_size=1024 groups_only=NS-common,NS-stgdev [Alerts] -plugin=/usr/local/lib/gridinit/gridinit_alert_spoolmess.so +plugin=/usr/local/lib/gridinit/gridinit_alert_implementation.so symbol=MODULE_EXPORT -config.sopcode=MUT-GRD-9000 -config.code_client=MUTU -config.code_projet=HoneyComb +config.sopcode=XXX-YYY-NNNN +config.code_client=B2B +config.code_projet=OIO-SDS [service.key0]