Skip to content

Commit 706b7f4

Browse files
aaronj0vgvassilev
authored andcommitted
Fix issues with DLM tests
1 parent f1899af commit 706b7f4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

unittests/CppInterOp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ target_link_libraries(DynamicLibraryManagerTests
3737
clangCppInterOp
3838
)
3939

40-
set_output_directory(DynamicLibraryManagerTests BINARY_DIR ${CMAKE_BINARY_DIR}/unittests/bin/$<CONFIG>/)
40+
set_output_directory(DynamicLibraryManagerTests BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/TestSharedLib/unittests/bin/$<CONFIG>/)
4141

4242
add_dependencies(DynamicLibraryManagerTests TestSharedLib)
4343
#export_executable_symbols_for_plugins(TestSharedLib)

unittests/CppInterOp/TestSharedLib/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_llvm_library(TestSharedLib
55
TestSharedLib.cpp)
66
# Put TestSharedLib next to the unit test executable.
77
set_output_directory(TestSharedLib
8-
BINARY_DIR ${CMAKE_BINARY_DIR}/unittests/bin/$<CONFIG>/
9-
LIBRARY_DIR ${CMAKE_BINARY_DIR}/unittests/bin/$<CONFIG>/
8+
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/unittests/bin/$<CONFIG>/
9+
LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/unittests/bin/$<CONFIG>/
1010
)
1111
set_target_properties(TestSharedLib PROPERTIES FOLDER "Tests")

unittests/CppInterOp/TestSharedLib/TestSharedLib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifdef _WIN32
66
extern "C" __declspec(dllexport) int ret_zero();
77
#else
8-
extern "C" int ret_zero();
8+
extern "C" int __attribute__((visibility("default"))) ret_zero();
99
#endif
1010

1111
#endif // UNITTESTS_CPPINTEROP_TESTSHAREDLIB_TESTSHAREDLIB_H

0 commit comments

Comments
 (0)