From e05380509b530c11626291fa5cdf8376e5428f67 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 29 May 2018 19:48:35 -0600 Subject: [PATCH] CMake: Adjust several forgotten component libraries --- panda/src/wgldisplay/CMakeLists.txt | 4 ++-- panda/src/windisplay/CMakeLists.txt | 4 ++-- panda/src/x11display/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/panda/src/wgldisplay/CMakeLists.txt b/panda/src/wgldisplay/CMakeLists.txt index 147e4b784a..a645b9ba9b 100644 --- a/panda/src/wgldisplay/CMakeLists.txt +++ b/panda/src/wgldisplay/CMakeLists.txt @@ -19,6 +19,6 @@ set(P3WGLDISPLAY_SOURCES composite_sources(p3wgldisplay P3WGLDISPLAY_SOURCES) -add_library(p3wgldisplay ${P3WGLDISPLAY_HEADERS} ${P3WGLDISPLAY_SOURCES}) -set_target_properties(p3wgldisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAGL) +add_component_library(p3wgldisplay SYMBOL BUILDING_PANDAGL + ${P3WGLDISPLAY_HEADERS} ${P3WGLDISPLAY_SOURCES}) target_link_libraries(p3wgldisplay p3display p3putil p3windisplay p3glgsg) diff --git a/panda/src/windisplay/CMakeLists.txt b/panda/src/windisplay/CMakeLists.txt index 363330d7e9..6234426986 100644 --- a/panda/src/windisplay/CMakeLists.txt +++ b/panda/src/windisplay/CMakeLists.txt @@ -14,6 +14,6 @@ set(P3WINDISPLAY_SOURCES winDetectDx9.cxx) composite_sources(p3windisplay P3WINDISPLAY_SOURCES) -add_library(p3windisplay ${P3WINDISPLAY_HEADERS} ${P3WINDISPLAY_SOURCES}) -set_target_properties(p3windisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAWIN) +add_component_library(p3windisplay SYMBOL BUILDING_PANDAWIN + ${P3WINDISPLAY_HEADERS} ${P3WINDISPLAY_SOURCES}) target_link_libraries(p3windisplay p3display p3putil Imm32.lib) diff --git a/panda/src/x11display/CMakeLists.txt b/panda/src/x11display/CMakeLists.txt index 21ae14c02a..2bfbb1ba6b 100644 --- a/panda/src/x11display/CMakeLists.txt +++ b/panda/src/x11display/CMakeLists.txt @@ -12,8 +12,8 @@ set(P3X11DISPLAY_SOURCES ) composite_sources(p3x11display P3X11DISPLAY_SOURCES) -add_library(p3x11display ${P3X11DISPLAY_HEADERS} ${P3X11DISPLAY_SOURCES}) -set_target_properties(p3x11display PROPERTIES DEFINE_SYMBOL BUILDING_PANDAX11) +add_component_library(p3x11display SYMBOL BUILDING_PANDAX11 + ${P3X11DISPLAY_HEADERS} ${P3X11DISPLAY_SOURCES}) target_link_libraries(p3x11display panda ${X11_LIBRARIES}) install(TARGETS p3x11display DESTINATION lib)