Skip to content
Snippets Groups Projects
Commit f36085b0 authored by Boroondas Gupte's avatar Boroondas Gupte
Browse files

merged SNOW-756 / VWR-23385 / STORM-374 (fixed standalone LD_LIBRARY_PATH for unit tests)

parents a8fbfa40 e26f812e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ f36085b0
...@@ -62,6 +62,7 @@ Alejandro Rosenthal ...@@ -62,6 +62,7 @@ Alejandro Rosenthal
VWR-1184 VWR-1184
Aleric Inglewood Aleric Inglewood
SNOW-522 SNOW-522
SNOW-756
SNOW-764 SNOW-764
VWR-10001 VWR-10001
VWR-10759 VWR-10759
......
indra/cmake/LLAddBuildTest.cmake
+ 5
− 1
View file @ f36085b0
...@@ -256,6 +256,10 @@ MACRO(SET_TEST_PATH LISTVAR) ...@@ -256,6 +256,10 @@ MACRO(SET_TEST_PATH LISTVAR)
set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib) set(${LISTVAR} ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/Resources ${SHARED_LIB_STAGING_DIR}/Release/Resources /usr/lib)
ELSE(WINDOWS) ELSE(WINDOWS)
# Linux uses a single staging directory anyway. # Linux uses a single staging directory anyway.
set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib) IF (STANDALONE)
set(${LISTVAR} ${CMAKE_BINARY_DIR}/llcommon /usr/lib /usr/local/lib)
ELSE (STANDALONE)
set(${LISTVAR} ${SHARED_LIB_STAGING_DIR} /usr/lib)
ENDIF (STANDALONE)
ENDIF(WINDOWS) ENDIF(WINDOWS)
ENDMACRO(SET_TEST_PATH) ENDMACRO(SET_TEST_PATH)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment