Cleanup the libraries linkage

hyperk · Sep 7, 2023 · 32080de · 32080de
1 parent 07c1576
commit 32080de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/UserTools/CMakeLists.txt b/UserTools/CMakeLists.txt
@@ -9,9 +9,9 @@ include_directories(BEFORE
 # Some hack to build the ToolChain library whose source files exist in the ToolFrameworkCore library
 set (TOOLCHAIN_SRC ${ToolFrameworkCore_SRC_DIR}/ToolChain.cpp)
 pbuilder_library(
-        TARGET ToolChain
+        TARGET MyHKLibToolChain
         SOURCES ${TOOLCHAIN_SRC}
-        PROJECT_LIBRARIES Factory
+        PROJECT_LIBRARIES MyHKLibFactory
         PUBLIC_EXTERNAL_LIBRARIES ToolFrameworkCore::ToolFrameworkCore hk-DataModel::DataModel
         PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
 )
@@ -23,5 +23,5 @@ add_subdirectory(WCSimTool)
 
 pbuilder_component_install_and_export(
         COMPONENT Library
-        LIBTARGETS DummyTool WCSimTool Factory ToolChain
+        LIBTARGETS DummyTool WCSimTool MyHKLibFactory MyHKLibToolChain
 )
diff --git a/UserTools/Factory/CMakeLists.txt b/UserTools/Factory/CMakeLists.txt
@@ -2,9 +2,9 @@ file(GLOB_RECURSE SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 file(GLOB_RECURSE HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
 
 pbuilder_library(
-        TARGET Factory
+        TARGET MyHKLibFactory
         SOURCES ${SRC}
-        PROJECT_LIBRARIES DummyTool
+        PROJECT_LIBRARIES DummyTool WCsimTool
         PUBLIC_EXTERNAL_LIBRARIES ToolFrameworkCore::ToolFrameworkCore
         PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
 )

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -3,10 +3,10 @@ file(GLOB_RECURSE EXE_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 pbuilder_executables (
         TARGETS_VAR progams
         SOURCES ${EXE_SRC}
-        PROJECT_LIBRARIES ToolFrameworkCore::ToolFrameworkCore DummyTool ToolChain WCSimTool
+        PROJECT_LIBRARIES ToolFrameworkCore::ToolFrameworkCore MyHKLibToolChain
 )
 
 pbuilder_component_install_and_export(
         COMPONENT Executable
-        EXETARGETS ${progams} # ToolChain Factory
+        EXETARGETS ${progams}
 )