Skip to content

Commit 0d52c81

Browse files
author
Panchumarti Jaswant EXT
committed
Fix rpath for build tree. Install tscBench
1 parent cbe29ae commit 0d52c81

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ set(tsc_version_suffix "")
3636
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
3737
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
3838
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}")
39+
3940
# Install rpath
4041
if(NOT DEFINED CMAKE_MACOSX_RPATH)
4142
set(CMAKE_MACOSX_RPATH TRUE)
4243
endif()
4344
if(NOT DEFINED CMAKE_BUILD_WITH_INSTALL_RPATH)
44-
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
45+
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
4546
endif()
4647
if(NOT DEFINED CMAKE_INSTALL_RPATH)
4748
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
@@ -221,7 +222,11 @@ endif()
221222

222223
if(TSC_BUILD_BENCH)
223224
add_executable(tscBench tscBench.cpp)
224-
target_link_libraries(tscBench PUBLIC ${VTK_LIBRARIES} tscTriSurfaceCutter)
225+
target_link_libraries(tscBench PRIVATE ${VTK_LIBRARIES} tscTriSurfaceCutter)
226+
install(
227+
TARGETS tscBench
228+
DESTINATION "${CMAKE_INSTALL_BINDIR}"
229+
)
225230
VTK_MODULE_AUTOINIT(TARGETS tscBench MODULES ${VTK_LIBRARIES} tscTriSurfaceCutter)
226231
endif()
227232

@@ -234,7 +239,7 @@ if(TSC_BUILD_TEST)
234239
set(TEST_RUNTIME_DIR ${PROJECT_BINARY_DIR}/Testing)
235240

236241
add_executable(TesttscTriSurfaceCutter ${TEST_SRC_DIR}/TesttscTriSurfaceCutter.cxx)
237-
target_link_libraries(TesttscTriSurfaceCutter PUBLIC ${VTK_LIBRARIES} tscTriSurfaceCutter)
242+
target_link_libraries(TesttscTriSurfaceCutter PRIVATE ${VTK_LIBRARIES} tscTriSurfaceCutter)
238243
add_test(NAME TesttscTriSurfaceCutter COMMAND TesttscTriSurfaceCutter WORKING_DIRECTORY ${TEST_RUNTIME_DIR})
239244

240245
foreach (i RANGE 5) # hard-coded

0 commit comments

Comments
 (0)