From b7242b68db364ebb1e2b011d27528767384bdd85 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Tue, 20 Nov 2018 10:08:38 +0100 Subject: [PATCH] [misc] spacing cosmetics --- CMakeLists.txt | 4 ++-- examples/smpi/ampi/ampi.tesh | 2 +- tools/cmake/MakeLib.cmake | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index daab600043..3d9417b9e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,7 +426,7 @@ if(CMAKE_USE_PTHREADS_INIT) RUN_OUTPUT_VARIABLE semopen_runmsg) if(semopen_compilable) - if(NOT semopen_retval) # error if not 0 + if(NOT semopen_retval) # error if not 0 message(STATUS "sem_open is compilable and executable") set(HAVE_SEM_OPEN 1) else() @@ -458,7 +458,7 @@ if(CMAKE_USE_PTHREADS_INIT) RUN_OUTPUT_VARIABLE seminit_runmsg) if(seminit_compilable) - if(NOT seminit_retval) # error if not 0 + if(NOT seminit_retval) # error if not 0 message(STATUS "sem_init is compilable and executable") set(HAVE_SEM_INIT 1) else() diff --git a/examples/smpi/ampi/ampi.tesh b/examples/smpi/ampi/ampi.tesh index 065216c1ab..3cb405a15a 100644 --- a/examples/smpi/ampi/ampi.tesh +++ b/examples/smpi/ampi/ampi.tesh @@ -30,5 +30,5 @@ $ bash -c "cat ${bindir:=.}/smpi_trace.trace_files/*" > 2 migrate 400 > 2 finalize -$ rm -rf ${bindir:=.}/smpi_trace.trace +$ rm -rf ${bindir:=.}/smpi_trace.trace $ rm -rf ${bindir:=.}/smpi_trace.trace_files diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index d7f1ade087..f937e5ac42 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -5,8 +5,8 @@ set(CMAKE_MACOSX_RPATH TRUE) if(APPLE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # When installed, use system path - set(CMAKE_SKIP_BUILD_RPATH FALSE) # When executing from build tree, take the lib from the build path if exists - set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # When executing from build tree, take the lib from the system path if exists + set(CMAKE_SKIP_BUILD_RPATH FALSE) # When executing from build tree, take the lib from the build path if exists + set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) # When executing from build tree, take the lib from the system path if exists # add the current location of libsimgrid-java.dynlib as a location for libsimgrid.dynlib # (useful when unpacking the native libraries from the jarfile) -- 2.20.1