From: Leonardo Florez-Valencia Date: Fri, 26 Jan 2018 12:32:42 +0000 (-0500) Subject: ... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6d504e819c8b6263d6b9446dae5b0edbd8ad4f21;p=cpPlugins.git ... --- diff --git a/cmake/cpPlgFunctions.cmake b/cmake/cpPlgFunctions.cmake index 21805df..893320d 100644 --- a/cmake/cpPlgFunctions.cmake +++ b/cmake/cpPlgFunctions.cmake @@ -191,32 +191,31 @@ else(BuildApplication_RECURRENT) endif(BuildApplication_RECURRENT) if(APPLE) -# use, i.e. don't skip the full RPATH for the build tree -SET(CMAKE_SKIP_BUILD_RPATH FALSE) + # use, i.e. don't skip the full RPATH for the build tree + SET(CMAKE_SKIP_BUILD_RPATH FALSE) -# when building, don't use the install RPATH already -# (but later on when installing) -SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + # when building, don't use the install RPATH already + # (but later on when installing) + SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -# add the automatically determined parts of the RPATH -# which point to directories outside the build tree to the install RPATH -SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + # add the automatically determined parts of the RPATH + # which point to directories outside the build tree to the install RPATH + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - -# the RPATH to be used when installing, but only if it's not a system directory -LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) -IF("${isSystemDir}" STREQUAL "-1") - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -ENDIF("${isSystemDir}" STREQUAL "-1") + # the RPATH to be used when installing, but only if it's not a system directory + LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) + IF("${isSystemDir}" STREQUAL "-1") + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + ENDIF("${isSystemDir}" STREQUAL "-1") endif(APPLE) ## -- Create an empty application set(_m ${CMAKE_CURRENT_BINARY_DIR}/__main__${app}.cxx) file(WRITE ${_m} "// Automatically generated dummy file") -## add_executable(${app} ${EXECUTABLE_TYPE} ${_m}) -add_executable(${app} ${_m}) +add_executable(${app} ${EXECUTABLE_TYPE} ${_m}) +## add_executable(${app} ${_m}) ## -- Link it against the static library target_link_libraries(${app} PUBLIC ${_lib})