Skip to content
Snippets Groups Projects
Commit 9aaf4b3b authored by Merov Linden's avatar Merov Linden
Browse files

STORM-981 : Fix Linux link issues when LL_TESTS is ON

parent 76cb9a77
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 @ 9aaf4b3b
...@@ -86,6 +86,7 @@ Aleric Inglewood ...@@ -86,6 +86,7 @@ Aleric Inglewood
VWR-24320 VWR-24320
VWR-24321 VWR-24321
VWR-24354 VWR-24354
VWR-24366
VWR-24519 VWR-24519
SNOW-84 SNOW-84
SNOW-477 SNOW-477
......
indra/cmake/GoogleMock.cmake
+ 3
− 2
View file @ 9aaf4b3b
...@@ -8,9 +8,10 @@ set(GOOGLEMOCK_INCLUDE_DIRS ...@@ -8,9 +8,10 @@ set(GOOGLEMOCK_INCLUDE_DIRS
${LIBS_PREBUILT_DIR}/include) ${LIBS_PREBUILT_DIR}/include)
if (LINUX) if (LINUX)
# VWR-24366: gmock is underlinked, it needs gtest.
set(GOOGLEMOCK_LIBRARIES set(GOOGLEMOCK_LIBRARIES
gmock gmock -Wl,--no-as-needed
gtest) gtest -Wl,--as-needed)
elseif(WINDOWS) elseif(WINDOWS)
set(GOOGLEMOCK_LIBRARIES set(GOOGLEMOCK_LIBRARIES
gmock) gmock)
......
indra/cmake/LLAddBuildTest.cmake
+ 0
− 5
View file @ 9aaf4b3b
...@@ -57,11 +57,6 @@ INCLUDE(GoogleMock) ...@@ -57,11 +57,6 @@ INCLUDE(GoogleMock)
${CMAKE_SOURCE_DIR}/test/test.h ${CMAKE_SOURCE_DIR}/test/test.h
) )
# Use the default flags
if (LINUX)
SET(CMAKE_EXE_LINKER_FLAGS "")
endif (LINUX)
# start the source test executable definitions # start the source test executable definitions
SET(${project}_TEST_OUTPUT "") SET(${project}_TEST_OUTPUT "")
FOREACH (source ${sources}) FOREACH (source ${sources})
......
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