adding path with libraries to grbrun

Author: alberto-scolari

cmake/AddGRBInstall.cmake

@@ -59,7 +59,6 @@ set( HYBRID_BACKEND_INSTALL_DIR "${BINARY_LIBRARIES_INSTALL_DIR}/hybrid" )
 # backend: (mandatory) argument name
 # COMPILER_COMMAND: (optional) Bash command (also including options, as a CMake list)
 #	to invoke the compiler; if left empty, it is set to CMAKE_CXX_COMPILER
-# RUNENV: (optional) environment variables for running the executable
 # RUNNER: (optional) runner command (also including options, as a CMake list) to
 #	run the executable
 # COMPILE_DEFINITIONS: (optional) definitions for compilation, as "SYMBOL" or
@@ -71,7 +70,7 @@ set( HYBRID_BACKEND_INSTALL_DIR "${BINARY_LIBRARIES_INSTALL_DIR}/hybrid" )
 # since they are expanded as macro arguments
 #
 function( addBackendWrapperGenOptions backend )
-	set( multiValueArgs "COMPILER_COMMAND;RUNENV;RUNNER"
+	set( multiValueArgs "COMPILER_COMMAND;RUNNER"
 		"COMPILE_DEFINITIONS;COMPILE_OPTIONS;LINK_FLAGS;LIB_DIR"
 	)
 	cmake_parse_arguments( parsed "${options}" "${oneValueArgs}"
@@ -88,7 +87,6 @@ function( addBackendWrapperGenOptions backend )
 	if( NOT parsed_COMPILER_COMMAND )
 		set( ${backend}_WRAPPER_COMPILER_COMMAND "${CMAKE_CXX_COMPILER}" PARENT_SCOPE )
 	endif()
-	set( ${backend}_WRAPPER_RUNENV "${parsed_RUNENV}" PARENT_SCOPE )
 	set( ${backend}_WRAPPER_RUNNER "${parsed_RUNNER}" PARENT_SCOPE )
 	set( ${backend}_LIB_DIR "${parsed_LIB_DIR}" PARENT_SCOPE )
 

src/CMakeLists.txt

@@ -52,17 +52,19 @@ endmacro( joinAndAppend )
 # of values to be stored inside the wrappers
 foreach( backend ${AVAILABLE_BACKENDS} )
 	assert_valid_variables( ${backend}_WRAPPER_COMPILER_COMMAND )
-	assert_defined_variables( ${backend}_WRAPPER_RUNENV ${backend}_WRAPPER_RUNNER
+	assert_defined_variables( ${backend}_WRAPPER_RUNNER ${backend}_WRAPPER_LINK_FLAGS
 		${backend}_WRAPPER_COMPILE_DEFINITIONS ${backend}_WRAPPER_COMPILE_OPTIONS
-		${backend}_WRAPPER_LINK_FLAGS
 	)
 
 	list( APPEND backend_list "\"${backend}\"" )
 	joinAndAppend( compiler_list ${backend}_WRAPPER_COMPILER_COMMAND )
 	joinAndAppend( library_dir ${backend}_LIB_DIR )
 
-	joinAndAppend( runenv_list ${backend}_WRAPPER_RUNENV )
 	joinAndAppend( runner_list ${backend}_WRAPPER_RUNNER )
+
+	string( TOUPPER ${backend} _bname )
+	list( APPEND backend_dir_list "ALP_${_bname}_LIBRARY_PATH=\"${${backend}_LIB_DIR}\"" )
+	joinAndAppend( runenv_list ${backend}_LIB_DIR )
 	set( compile_options "${${backend}_WRAPPER_COMPILE_DEFINITIONS}" )
 	list( TRANSFORM compile_options PREPEND "-D" )
 	list( APPEND compile_options ${${backend}_WRAPPER_COMPILE_OPTIONS} )
@@ -85,6 +87,7 @@ endmacro( joinWithNewLine )
 joinWithNewLine( backend_list AVAILABLE_BACKENDS_SPACED )
 list( JOIN LPFRUN_CMD " " LPFRUN_CMD_SPACED )
 list( JOIN MANUALRUN " " MANUALRUN_SPACED )
+joinWithNewLine( backend_dir_list BACKEND_DIR_LIST )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/setenv.in ${CMAKE_CURRENT_BINARY_DIR}/setenv @ONLY )
 
 set( cflags "${COMMON_WRAPPER_DEFINITIONS}" )

src/grbrun.in

@@ -60,11 +60,6 @@ then
 fi
 
 RUNNER=${BACKENDRUNNER[${BACKENDID}]}
+LD_PATH="@ALP_UTILS_INSTALL_DIR@:${BACKENDRUNENV[${BACKENDID}]}"
 
-EXPENV=${BACKENDRUNENV[${BACKENDID}]}
-if [ -n "${EXPENV}" ]; then
-	export ${EXPENV}
-fi
-
-${SHOW} ${RUNNER} "${ARGS[@]}" "$@"
-
+${SHOW} LD_LIBRARY_PATH="${LD_PATH}:${LD_LIBRARY_PATH}" ${RUNNER} "${ARGS[@]}" "$@"