CMake: Ensure all target_link_libraries specify public/private/interface

Closes #701
FLAMEGPU · Oct 6, 2021 · 609e1bc · 609e1bc
1 parent c5db615
commit 609e1bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/cmake/common.cmake b/cmake/common.cmake
@@ -308,12 +308,12 @@ function(add_flamegpu_executable NAME SRC FLAMEGPU_ROOT PROJECT_ROOT IS_EXAMPLE)
     set_property(TARGET ${NAME} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
 
     # Link against the flamegpu static library target.
-    target_link_libraries(${NAME} flamegpu)
+    target_link_libraries(${NAME} PRIVATE flamegpu)
     # Workaround for incremental rebuilds on MSVC, where device link was not being performed.
     # https://github.com/FLAMEGPU/FLAMEGPU2/issues/483
     if(MSVC AND CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL "11.1")
         # Provide the absolute path to the lib file, rather than the relative version cmake provides.
-        target_link_libraries(${NAME} "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE:flamegpu>")
+        target_link_libraries(${NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE:flamegpu>")
     endif()
 
     # Activate visualisation if requested

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -124,8 +124,7 @@ if(BUILD_TESTS)
     # Add the tests directory to the include path,
     target_include_directories("${PROJECT_NAME}" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
     # Add the targets we depend on (this does link and include)
-    target_link_libraries("${PROJECT_NAME}" GTest::gtest)
-    # target_link_libraries("${PROJECT_NAME}" gmock) # Currently unused
+    target_link_libraries("${PROJECT_NAME}" PRIVATE GTest::gtest)
     # Put Within Tests filter
     CMAKE_SET_TARGET_FOLDER("${PROJECT_NAME}" "Tests")
     # Also set as startup project (if top level project)
@@ -159,8 +158,8 @@ if(BUILD_TESTS_DEV)
     # Add the tests directory to the include path,
     target_include_directories("${PROJECT_NAME}" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
     # Add the targets we depend on (this does link and include)
-    target_link_libraries("${PROJECT_NAME}" GTest::gtest)
-    # target_link_libraries("${PROJECT_NAME}" gmock) # Currently unused
+    target_link_libraries("${PROJECT_NAME}" PRIVATE GTest::gtest)
+    # Put Within Tests filter
     CMAKE_SET_TARGET_FOLDER("${PROJECT_NAME}" "Tests")
     # Set the default (visual studio) debugger configure_file
     set_target_properties("${PROJECT_NAME}" PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"