summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-06 22:38:08 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-06 23:33:06 +0200
commitef989bce374516192c59be32af674de19295a31a (patch)
tree2feaf550f832c9a53cc43906d876434688528019 /indra/llcommon
parentbe71a255a0831b865bdd6a1a2c8b86ac710fd379 (diff)
On OSX llcommon also needs CMAKE_CURRENT_SOURCE_DIR as PRIVATE include dir.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/CMakeLists.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 901686c815..0fd2581dd4 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -290,6 +290,7 @@ target_link_libraries(
)
set_target_include_dirs( llcommon ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories( llcommon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )
if (DARWIN)
include(CMakeFindFrameworks)
@@ -307,10 +308,10 @@ if (LL_TESTS)
LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}")
#set(TEST_DEBUG on)
- set(test_libs llcommon
- ${WINDOWS_LIBRARIES}
- ${GOOGLEMOCK_LIBRARIES}
- )
+ set(test_libs llcommon
+ ${WINDOWS_LIBRARIES}
+ googlemock::googlemock
+ )
LL_ADD_INTEGRATION_TEST(bitpack "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(classic_callback "" "${test_libs}")
LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}")