From c6096c26901f46fd3a660616df7865311f54fefe Mon Sep 17 00:00:00 2001 From: rdb Date: Fri, 5 Feb 2016 17:44:06 +0100 Subject: [PATCH] Bring CMakeLists files up to date to match latest master --- panda/src/nativenet/CMakeLists.txt | 6 +++--- panda/src/pnmtext/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt index dd682762d1..78da36d243 100644 --- a/panda/src/nativenet/CMakeLists.txt +++ b/panda/src/nativenet/CMakeLists.txt @@ -1,15 +1,15 @@ if(WANT_NATIVE_NET) set(P3NATIVENET_HEADERS buffered_datagramconnection.h - buffered_datagramreader.h buffered_datagramreader.i - ringbuffer.h ringbuffer.i socket_ip.h + buffered_datagramreader.h buffered_datagramreader.I + ringbuffer.h ringbuffer.I socket_ip.h socket_tcp_listen.h time_accumulator.h time_out.h socket_address.I socket_address.h socket_portable.h time_base.h time_span.h buffered_datagramwriter.h socket_base.h socket_selector.h socket_udp.h socket_udp_incoming.h time_clock.h - membuffer.h membuffer.i socket_fdset.h socket_tcp.h + membuffer.h membuffer.I socket_fdset.h socket_tcp.h socket_udp_outgoing.h time_general.h) set(P3NATIVENET_SOURCES diff --git a/panda/src/pnmtext/CMakeLists.txt b/panda/src/pnmtext/CMakeLists.txt index 86764755d2..ffb3388961 100644 --- a/panda/src/pnmtext/CMakeLists.txt +++ b/panda/src/pnmtext/CMakeLists.txt @@ -16,7 +16,7 @@ if(HAVE_FREETYPE) composite_sources(p3pnmtext P3PNMTEXT_SOURCES) add_library(p3pnmtext ${P3PNMTEXT_HEADERS} ${P3PNMTEXT_SOURCES}) - target_link_libraries(p3pnmtext p3pnmimage ${_FREETYPE_LIBRARIES}) + target_link_libraries(p3pnmtext p3parametrics p3pnmimage ${_FREETYPE_LIBRARIES}) target_interrogate(p3pnmtext ALL) install(TARGETS p3pnmtext DESTINATION lib)