From 380953937fb41ae8dfc716f9c3899c6cd88b2d71 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Mon, 26 Jun 2023 11:56:09 -0700 Subject: [PATCH] [mammoth] Rename cmake target to remove _lib --- lib/mammoth/CMakeLists.txt | 8 ++++---- sys/denali/CMakeLists.txt | 4 ++-- sys/victoriafalls/CMakeLists.txt | 2 +- sys/yellowstone/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/mammoth/CMakeLists.txt b/lib/mammoth/CMakeLists.txt index f462f82..935abe2 100644 --- a/lib/mammoth/CMakeLists.txt +++ b/lib/mammoth/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(mammoth_lib STATIC +add_library(mammoth STATIC src/channel.cpp src/debug.cpp src/endpoint_client.cpp @@ -12,16 +12,16 @@ add_library(mammoth_lib STATIC src/thread.cpp ) -target_include_directories(mammoth_lib +target_include_directories(mammoth PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -target_link_libraries(mammoth_lib +target_link_libraries(mammoth glacier c zion_lib) -set_target_properties(mammoth_lib PROPERTIES +set_target_properties(mammoth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${BASE_COMPILE_FLAGS}" LINK_FLAGS "${CMAKE_EXE_LINK_FLAGS} ${BASE_LINK_FLAGS}" ) diff --git a/sys/denali/CMakeLists.txt b/sys/denali/CMakeLists.txt index 7e9d087..013654b 100644 --- a/sys/denali/CMakeLists.txt +++ b/sys/denali/CMakeLists.txt @@ -13,7 +13,7 @@ target_include_directories(denali target_link_libraries(denali glacier - mammoth_lib + mammoth yellowstonestub ) @@ -31,7 +31,7 @@ target_include_directories(libdenali PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(libdenali - mammoth_lib) + mammoth) set_target_properties(libdenali PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS} ${BASE_COMPILE_FLAGS}" diff --git a/sys/victoriafalls/CMakeLists.txt b/sys/victoriafalls/CMakeLists.txt index 5331f6d..730daf1 100644 --- a/sys/victoriafalls/CMakeLists.txt +++ b/sys/victoriafalls/CMakeLists.txt @@ -7,7 +7,7 @@ target_include_directories(victoriafalls target_link_libraries(victoriafalls glacier - mammoth_lib + mammoth ) set_target_properties(victoriafalls PROPERTIES diff --git a/sys/yellowstone/CMakeLists.txt b/sys/yellowstone/CMakeLists.txt index 6d6186d..67bcbeb 100644 --- a/sys/yellowstone/CMakeLists.txt +++ b/sys/yellowstone/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(yellowstone PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(yellowstone - mammoth_lib + mammoth glacier libdenali )