Skip to content

Commit

Permalink
Merge pull request #1 from jfsmig/master
Browse files Browse the repository at this point in the history
cmake: now uses the standard CMAKE_INSTALL_PREFIX
  • Loading branch information
jkasarherou committed Mar 19, 2015
2 parents 0c06048 + 5ffb9f4 commit 287c205
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 11 deletions.
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions gridinit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down

0 comments on commit 287c205

Please sign in to comment.