From 940ef456ff2b5236c4177b35d84a48c8ca1e1f26 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 27 Nov 2018 19:21:01 -0700 Subject: [PATCH] CMake: Only link PRIVATEly against libraries not installed --- pandatool/src/assimp/CMakeLists.txt | 4 ++-- pandatool/src/egg-palettize/CMakeLists.txt | 2 +- pandatool/src/ptloader/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pandatool/src/assimp/CMakeLists.txt b/pandatool/src/assimp/CMakeLists.txt index b65bdca8df..22792091a4 100644 --- a/pandatool/src/assimp/CMakeLists.txt +++ b/pandatool/src/assimp/CMakeLists.txt @@ -23,7 +23,7 @@ set(P3ASSIMP_SOURCES composite_sources(p3assimp P3ASSIMP_SOURCES) add_library(p3assimp ${MODULE_TYPE} ${P3ASSIMP_HEADERS} ${P3ASSIMP_SOURCES}) set_target_properties(p3assimp PROPERTIES DEFINE_SYMBOL BUILDING_ASSIMP) -target_link_libraries(p3assimp p3pandatoolbase - PKG::ASSIMP) +target_link_libraries(p3assimp PRIVATE p3pandatoolbase) +target_link_libraries(p3assimp PUBLIC PKG::ASSIMP) install(TARGETS p3assimp DESTINATION ${MODULE_DESTINATION}) diff --git a/pandatool/src/egg-palettize/CMakeLists.txt b/pandatool/src/egg-palettize/CMakeLists.txt index 81e7da0ace..570e6beeb6 100644 --- a/pandatool/src/egg-palettize/CMakeLists.txt +++ b/pandatool/src/egg-palettize/CMakeLists.txt @@ -4,5 +4,5 @@ install(TARGETS egg-palettize DESTINATION bin) add_library(p3txafile txaFileFilter.cxx txaFileFilter.h txaFileFilter.I) set_target_properties(p3txafile PROPERTIES DEFINE_SYMBOL BUILDING_MISC) -target_link_libraries(p3txafile p3palettizer) +target_link_libraries(p3txafile PRIVATE p3palettizer) install(TARGETS p3txafile DESTINATION lib RUNTIME DESTINATION bin) diff --git a/pandatool/src/ptloader/CMakeLists.txt b/pandatool/src/ptloader/CMakeLists.txt index c3335c37d4..34dbfacabf 100644 --- a/pandatool/src/ptloader/CMakeLists.txt +++ b/pandatool/src/ptloader/CMakeLists.txt @@ -11,7 +11,7 @@ set(P3PTLOADER_SOURCES composite_sources(p3ptloader P3PTLOADER_SOURCES) add_library(p3ptloader ${MODULE_TYPE} ${P3PTLOADER_HEADERS} ${P3PTLOADER_SOURCES}) set_target_properties(p3ptloader PROPERTIES DEFINE_SYMBOL BUILDING_PTLOADER) -target_link_libraries(p3ptloader +target_link_libraries(p3ptloader PRIVATE p3dxfegg p3fltegg p3lwoegg p3objegg p3vrmlegg p3xfileegg p3converter)