From 2af95517504087a693d421b14a265db0506b76c5 Mon Sep 17 00:00:00 2001 From: kestred Date: Tue, 21 Jan 2014 23:11:51 -0700 Subject: [PATCH] Add CMakeLists.txt to pnmtext. --- panda/CMakeLists.txt | 6 ++++++ panda/src/device/CMakeLists.txt | 18 +++++++++--------- panda/src/pnmtext/CMakeLists.txt | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 panda/src/pnmtext/CMakeLists.txt diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt index 6399687273..b6f69dd2a7 100644 --- a/panda/CMakeLists.txt +++ b/panda/CMakeLists.txt @@ -14,6 +14,9 @@ endif() if(HAVE_CG) include_directories(${CG_INCLUDE_DIRS}) endif() +if(HAVE_FREETYPE) + include_directories(${FREETYPE_INCLUDE_DIRS}) +endif() # Include panda source directories add_subdirectory(src/pandabase) @@ -36,7 +39,10 @@ add_subdirectory(src/chan) add_subdirectory(src/char) add_subdirectory(src/dgraph) add_subdirectory(src/device) +add_subdirectory(src/pnmtext) +#add_subdirectory(src/text) +#add_subdirectory(src/grutil) #add_subdirectory(src/tform) #add_subdirectory(src/framework) #add_subdirectory(src/testbed) diff --git a/panda/src/device/CMakeLists.txt b/panda/src/device/CMakeLists.txt index b33fff0d40..0b7eaedb1e 100644 --- a/panda/src/device/CMakeLists.txt +++ b/panda/src/device/CMakeLists.txt @@ -1,12 +1,12 @@ set(P3DEVICE_HEADERS analogNode.I analogNode.h - buttonNode.I buttonNode.h - clientAnalogDevice.I clientAnalogDevice.h clientBase.I - clientBase.h clientButtonDevice.I clientButtonDevice.h - clientDevice.I clientDevice.h clientDialDevice.I - clientDialDevice.h clientTrackerDevice.I + buttonNode.I buttonNode.h + clientAnalogDevice.I clientAnalogDevice.h clientBase.I + clientBase.h clientButtonDevice.I clientButtonDevice.h + clientDevice.I clientDevice.h clientDialDevice.I + clientDialDevice.h clientTrackerDevice.I clientTrackerDevice.h config_device.h - dialNode.I dialNode.h + dialNode.I dialNode.h mouseAndKeyboard.h trackerData.I trackerData.h trackerNode.I trackerNode.h @@ -15,9 +15,9 @@ set(P3DEVICE_HEADERS set(P3DEVICE_SOURCES analogNode.cxx buttonNode.cxx - clientAnalogDevice.cxx - clientBase.cxx clientButtonDevice.cxx clientDevice.cxx - clientDialDevice.cxx clientTrackerDevice.cxx + clientAnalogDevice.cxx + clientBase.cxx clientButtonDevice.cxx clientDevice.cxx + clientDialDevice.cxx clientTrackerDevice.cxx config_device.cxx dialNode.cxx mouseAndKeyboard.cxx diff --git a/panda/src/pnmtext/CMakeLists.txt b/panda/src/pnmtext/CMakeLists.txt new file mode 100644 index 0000000000..999b43b2b2 --- /dev/null +++ b/panda/src/pnmtext/CMakeLists.txt @@ -0,0 +1,19 @@ +set(P3PNMTEXT_HEADERS + config_pnmtext.h + freetypeFace.h freetypeFace.I + freetypeFont.h freetypeFont.I + pnmTextGlyph.h pnmTextGlyph.I + pnmTextMaker.h pnmTextMaker.I +) +set(P3PNMTEXT_SOURCES + config_pnmtext.cxx + freetypeFace.cxx + freetypeFont.cxx + pnmTextGlyph.cxx + pnmTextMaker.cxx +) + +composite_sources(p3pnmtext P3PNMTEXT_SOURCES) +add_library(p3pnmtext ${P3PNMTEXT_SOURCES} ${P3PNMTEXT_HEADERS}) +target_link_libraries(p3pnmtext p3pnmimage) +target_interrogate(p3pnmtext ALL)