linking also utils lib statically in wrapper

Author: alberto-scolari

cmake/AddGRBInstall.cmake

@@ -54,11 +54,7 @@ set( HYBRID_BACKEND_INSTALL_DIR "${BINARY_LIBRARIES_INSTALL_DIR}/hybrid" )
 set( COMMON_COMPILE_DEFINITIONS  "${REFERENCE_INCLUDE_DEFS};${REFERENCE_OMP_INCLUDE_DEFS}" )
 set( COMMON_COMPILE_OPTIONS "-fopenmp" )
 
-# link flags common to all backends, to be inserted before and after the
-# backend-specific flags
-set( COMMON_LFLAGS_PRE
-	"-l${ALP_UTILS_LIBRARY_OUTPUT_NAME};-L '${BINARY_LIBRARIES_INSTALL_DIR}'"
-)
+# link flags common to all backends, to be inserted after the backend-specific flags
 if( WITH_NUMA )
 	list( APPEND COMMON_LFLAGS_POST "-lnuma"  )
 endif()

src/CMakeLists.txt

@@ -28,7 +28,7 @@ add_subdirectory( transition )
 ### BUILD WRAPPER SCRIPTS FOR INSTALLATION
 
 assert_valid_variables( AVAILABLE_BACKENDS CMAKE_INSTALL_PREFIX INCLUDE_INSTALL_DIR
-	VERSION BIN_INSTALL_DIR COMMON_LFLAGS_PRE COMMON_LFLAGS_POST
+	VERSION BIN_INSTALL_DIR COMMON_LFLAGS_POST
 )
 
 if( WITH_BSP1D_BACKEND OR WITH_HYBRID_BACKEND )
@@ -94,7 +94,6 @@ joinWithNewLine( library_dir LIBRARY_DIRS_SPACED )
 
 joinWithNewLine( compile_options_list BACKEND_CFLAGS_SPACED )
 joinWithNewLine( link_flags_list BACKEND_LFLAGS_SPACED )
-list( JOIN COMMON_LFLAGS_PRE " " COMMON_LFLAGS_PRE_SPACED )
 list( JOIN COMMON_LFLAGS_POST " " COMMON_LFLAGS_POST_SPACED )
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/grbcxx.in ${CMAKE_CURRENT_BINARY_DIR}/grbcxx @ONLY )
 

src/grbcxx.in

@@ -24,6 +24,8 @@ BACKENDLFLAGS=(@BACKEND_LFLAGS_SPACED@)
 VERSION="@VERSION@"
 BACKEND_LIBRARY_OUTPUT_NAME="@BACKEND_LIBRARY_OUTPUT_NAME@"
 LIBRARY_DIRS=(@LIBRARY_DIRS_SPACED@)
+UTILS_LIBRARY_NAME="@ALP_UTILS_LIBRARY_OUTPUT_NAME@"
+UTILS_LIBRARY_DIR="@ALP_UTILS_INSTALL_DIR@"
 
 declare -a ARGS
 LINK="dynamic"
@@ -127,11 +129,11 @@ then
 fi
 
 if [[ "${LINK}" == "dynamic" ]]; then
-	LIB="-l${BACKEND_LIBRARY_OUTPUT_NAME} -L '${LIBRARY_DIRS[${BACKENDID}]}'"
+	LIB="-l${UTILS_LIBRARY_NAME} -L '${UTILS_LIBRARY_DIR}' -l${BACKEND_LIBRARY_OUTPUT_NAME} -L '${LIBRARY_DIRS[${BACKENDID}]}'"
 else
-	LIB="'${LIBRARY_DIRS[${BACKENDID}]}/lib${BACKEND_LIBRARY_OUTPUT_NAME}.a'"
+	LIB="'${UTILS_LIBRARY_DIR}/lib${UTILS_LIBRARY_NAME}.a'  '${LIBRARY_DIRS[${BACKENDID}]}/lib${BACKEND_LIBRARY_OUTPUT_NAME}.a'"
 fi
-LFLAGS="@COMMON_LFLAGS_PRE_SPACED@ ${LIB} ${BACKENDLFLAGS[${BACKENDID}]} @COMMON_LFLAGS_POST_SPACED@"
+LFLAGS="${LIB} ${BACKENDLFLAGS[${BACKENDID}]} @COMMON_LFLAGS_POST_SPACED@"
 
 CMD="${COMPILER} -std=${CXXSTD} -I'${INCLUDEDIR}' ${BACKENDCFLAGS[${BACKENDID}]} ${ARGS[@]} "$@" ${LFLAGS}"