From 5e77793b0f981ab418ee875ec754367b33937113 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 4 Feb 2014 22:43:23 -0700 Subject: [PATCH] CMake: Add some install(...) directives. --- direct/src/autorestart/CMakeLists.txt | 1 + direct/src/dcparse/CMakeLists.txt | 1 + direct/src/dcparser/CMakeLists.txt | 2 ++ direct/src/deadrec/CMakeLists.txt | 2 ++ direct/src/directbase/CMakeLists.txt | 2 ++ direct/src/distributed/CMakeLists.txt | 2 ++ direct/src/interval/CMakeLists.txt | 2 ++ direct/src/showbase/CMakeLists.txt | 2 ++ dtool/metalibs/dtool/CMakeLists.txt | 2 ++ dtool/metalibs/dtoolconfig/CMakeLists.txt | 2 ++ dtool/src/cppparser/CMakeLists.txt | 2 ++ dtool/src/dconfig/CMakeLists.txt | 2 ++ dtool/src/dtoolbase/CMakeLists.txt | 2 ++ dtool/src/dtoolutil/CMakeLists.txt | 2 ++ dtool/src/interrogate/CMakeLists.txt | 2 ++ dtool/src/interrogatedb/CMakeLists.txt | 2 ++ dtool/src/prc/CMakeLists.txt | 2 ++ panda/metalibs/panda/CMakeLists.txt | 2 ++ panda/metalibs/pandaegg/CMakeLists.txt | 2 ++ panda/metalibs/pandagl/CMakeLists.txt | 2 ++ panda/src/audio/CMakeLists.txt | 2 ++ panda/src/chan/CMakeLists.txt | 2 ++ panda/src/char/CMakeLists.txt | 2 ++ panda/src/collide/CMakeLists.txt | 2 ++ panda/src/cull/CMakeLists.txt | 2 ++ panda/src/device/CMakeLists.txt | 2 ++ panda/src/dgraph/CMakeLists.txt | 2 ++ panda/src/display/CMakeLists.txt | 2 ++ panda/src/downloader/CMakeLists.txt | 2 ++ panda/src/egg/CMakeLists.txt | 2 ++ panda/src/egg2pg/CMakeLists.txt | 2 ++ panda/src/event/CMakeLists.txt | 4 +++- panda/src/express/CMakeLists.txt | 2 ++ panda/src/framework/CMakeLists.txt | 2 ++ panda/src/glgsg/CMakeLists.txt | 2 ++ panda/src/glstuff/CMakeLists.txt | 2 ++ panda/src/glxdisplay/CMakeLists.txt | 2 ++ panda/src/gobj/CMakeLists.txt | 2 ++ panda/src/grutil/CMakeLists.txt | 2 ++ panda/src/gsgbase/CMakeLists.txt | 2 ++ panda/src/linmath/CMakeLists.txt | 2 ++ panda/src/mathutil/CMakeLists.txt | 2 ++ panda/src/movies/CMakeLists.txt | 2 ++ panda/src/nativenet/CMakeLists.txt | 2 ++ panda/src/net/CMakeLists.txt | 2 ++ panda/src/pandabase/CMakeLists.txt | 2 ++ panda/src/parametrics/CMakeLists.txt | 2 ++ panda/src/pgraph/CMakeLists.txt | 2 ++ panda/src/pgraphnodes/CMakeLists.txt | 2 ++ panda/src/pgui/CMakeLists.txt | 2 ++ panda/src/pipeline/CMakeLists.txt | 2 ++ panda/src/pnmimage/CMakeLists.txt | 2 ++ panda/src/pnmimagetypes/CMakeLists.txt | 2 ++ panda/src/pnmtext/CMakeLists.txt | 2 ++ panda/src/pstatclient/CMakeLists.txt | 2 ++ panda/src/putil/CMakeLists.txt | 2 ++ panda/src/recorder/CMakeLists.txt | 2 ++ panda/src/testbed/CMakeLists.txt | 1 + panda/src/text/CMakeLists.txt | 2 ++ panda/src/tform/CMakeLists.txt | 2 ++ panda/src/x11display/CMakeLists.txt | 2 ++ 61 files changed, 120 insertions(+), 1 deletion(-) diff --git a/direct/src/autorestart/CMakeLists.txt b/direct/src/autorestart/CMakeLists.txt index 31524487c5..eef609e69c 100644 --- a/direct/src/autorestart/CMakeLists.txt +++ b/direct/src/autorestart/CMakeLists.txt @@ -1,3 +1,4 @@ add_executable(autorestart autorestart.c) set_target_properties(autorestart PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA) target_link_libraries(autorestart p3dtool) +install(TARGETS autorestart DESTINATION bin) diff --git a/direct/src/dcparse/CMakeLists.txt b/direct/src/dcparse/CMakeLists.txt index a50ebdb3b1..947c67dfec 100644 --- a/direct/src/dcparse/CMakeLists.txt +++ b/direct/src/dcparse/CMakeLists.txt @@ -1,3 +1,4 @@ add_executable(dcparse dcparse.cxx) set_target_properties(dcparse PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA) target_link_libraries(dcparse p3dcparser) +install(TARGETS dcparse DESTINATION bin) diff --git a/direct/src/dcparser/CMakeLists.txt b/direct/src/dcparser/CMakeLists.txt index 1838865b81..36ef2541e0 100644 --- a/direct/src/dcparser/CMakeLists.txt +++ b/direct/src/dcparser/CMakeLists.txt @@ -51,3 +51,5 @@ add_library(p3dcparser ${P3DCPARSER_SOURCES} ${P3DCPARSER_HEADERS} set_target_properties(p3dcparser PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA) target_link_libraries(p3dcparser p3directbase p3express p3pstatclient p3prc) target_interrogate(p3dcparser ${P3DCPARSER_SOURCES} ${P3DCPARSER_HEADERS}) + +install(TARGETS p3dcparser DESTINATION lib) diff --git a/direct/src/deadrec/CMakeLists.txt b/direct/src/deadrec/CMakeLists.txt index 043fc62cd6..669d98b28f 100644 --- a/direct/src/deadrec/CMakeLists.txt +++ b/direct/src/deadrec/CMakeLists.txt @@ -9,3 +9,5 @@ set(P3DEADREC_SOURCES add_library(p3deadrec ${P3DEADREC_HEADERS} ${P3DEADREC_SOURCES}) target_link_libraries(p3deadrec p3directbase p3linmath p3pgraph p3prc) target_interrogate(p3deadrec ALL) + +install(TARGETS p3deadrec DESTINATION lib) diff --git a/direct/src/directbase/CMakeLists.txt b/direct/src/directbase/CMakeLists.txt index 1be8a56434..3e1d332ab5 100644 --- a/direct/src/directbase/CMakeLists.txt +++ b/direct/src/directbase/CMakeLists.txt @@ -9,3 +9,5 @@ set(P3DIRECTBASE_HEADERS # Not worth compositing sources, there's really only one. add_library(p3directbase ${P3DIRECTBASE_SOURCES} ${P3DIRECTBASE_HEADERS}) target_link_libraries(p3directbase p3pandabase) + +install(TARGETS p3directbase DESTINATION lib) diff --git a/direct/src/distributed/CMakeLists.txt b/direct/src/distributed/CMakeLists.txt index 681004e608..0da55087a1 100644 --- a/direct/src/distributed/CMakeLists.txt +++ b/direct/src/distributed/CMakeLists.txt @@ -21,4 +21,6 @@ if(HAVE_PYTHON) target_link_libraries(p3distributed p3net) endif() target_interrogate(p3distributed ALL) + + install(TARGETS p3distributed DESTINATION lib) endif() diff --git a/direct/src/interval/CMakeLists.txt b/direct/src/interval/CMakeLists.txt index 03b9feddf0..6931de86c9 100644 --- a/direct/src/interval/CMakeLists.txt +++ b/direct/src/interval/CMakeLists.txt @@ -39,3 +39,5 @@ composite_sources(p3interval P3INTERVAL_SOURCES) add_library(p3interval ${P3INTERVAL_HEADERS} ${P3INTERVAL_SOURCES}) target_link_libraries(p3interval p3directbase p3pstatclient p3pgraph p3chan p3dconfig p3prc) target_interrogate(p3interval ALL) + +install(TARGETS p3interval DESTINATION lib) diff --git a/direct/src/showbase/CMakeLists.txt b/direct/src/showbase/CMakeLists.txt index 36e4f70b25..879a23918e 100644 --- a/direct/src/showbase/CMakeLists.txt +++ b/direct/src/showbase/CMakeLists.txt @@ -1,3 +1,5 @@ add_library(p3showbase showBase.cxx showBase.h) target_link_libraries(p3showbase p3directbase p3express p3event p3chan p3display p3dconfig p3prc) target_interrogate(p3showbase ALL) + +install(TARGETS p3showbase DESTINATION lib) diff --git a/dtool/metalibs/dtool/CMakeLists.txt b/dtool/metalibs/dtool/CMakeLists.txt index 54f02f0045..1ace855669 100644 --- a/dtool/metalibs/dtool/CMakeLists.txt +++ b/dtool/metalibs/dtool/CMakeLists.txt @@ -1,2 +1,4 @@ add_library(p3dtool dtool.cxx) target_link_libraries(p3dtool p3dtoolutil p3dtoolbase) + +install(TARGETS p3dtool DESTINATION lib) diff --git a/dtool/metalibs/dtoolconfig/CMakeLists.txt b/dtool/metalibs/dtoolconfig/CMakeLists.txt index 054d2095bc..cf791fbde9 100644 --- a/dtool/metalibs/dtoolconfig/CMakeLists.txt +++ b/dtool/metalibs/dtoolconfig/CMakeLists.txt @@ -8,3 +8,5 @@ else() endif() target_link_libraries(p3dtoolconfig p3prc p3dconfig p3interrogatedb) + +install(TARGETS p3dtoolconfig DESTINATION lib) diff --git a/dtool/src/cppparser/CMakeLists.txt b/dtool/src/cppparser/CMakeLists.txt index 1e6ba9e511..9e1f20a186 100644 --- a/dtool/src/cppparser/CMakeLists.txt +++ b/dtool/src/cppparser/CMakeLists.txt @@ -40,3 +40,5 @@ composite_sources(p3cppParser P3CPPPARSER_SOURCES) add_library(p3cppParser STATIC ${P3CPPPARSER_HEADERS} ${P3CPPPARSER_SOURCES}) target_link_libraries(p3cppParser p3dtoolutil) + +install(TARGETS p3cppParser DESTINATION lib) diff --git a/dtool/src/dconfig/CMakeLists.txt b/dtool/src/dconfig/CMakeLists.txt index 7c71d68d82..f07c356b58 100644 --- a/dtool/src/dconfig/CMakeLists.txt +++ b/dtool/src/dconfig/CMakeLists.txt @@ -8,3 +8,5 @@ composite_sources(p3dconfig P3DCONFIG_SOURCES) add_library(p3dconfig ${P3DCONFIG_HEADERS} ${P3DCONFIG_SOURCES}) target_link_libraries(p3dconfig p3prc) + +install(TARGETS p3dconfig DESTINATION lib) diff --git a/dtool/src/dtoolbase/CMakeLists.txt b/dtool/src/dtoolbase/CMakeLists.txt index 98c7ed19e9..8a93e83399 100644 --- a/dtool/src/dtoolbase/CMakeLists.txt +++ b/dtool/src/dtoolbase/CMakeLists.txt @@ -65,3 +65,5 @@ add_library(p3dtoolbase ${P3DTOOLBASE_HEADERS} ${P3DTOOLBASE_SOURCES}) if(HAVE_PYTHON) target_link_libraries(p3dtoolbase ${PYTHON_LIBRARIES}) endif() + +install(TARGETS p3dtoolbase DESTINATION lib) diff --git a/dtool/src/dtoolutil/CMakeLists.txt b/dtool/src/dtoolutil/CMakeLists.txt index a7c94098ac..04a4e0ce6c 100644 --- a/dtool/src/dtoolutil/CMakeLists.txt +++ b/dtool/src/dtoolutil/CMakeLists.txt @@ -55,3 +55,5 @@ target_link_libraries(p3dtoolutil p3dtoolbase ${CMAKE_DL_LIBS}) if(HAVE_PYTHON) target_link_libraries(p3dtoolutil ${PYTHON_LIBRARIES}) endif() + +install(TARGETS p3dtoolutil DESTINATION lib) diff --git a/dtool/src/interrogate/CMakeLists.txt b/dtool/src/interrogate/CMakeLists.txt index f5404dc028..7ff12f5850 100644 --- a/dtool/src/interrogate/CMakeLists.txt +++ b/dtool/src/interrogate/CMakeLists.txt @@ -51,8 +51,10 @@ add_executable(interrogate ${INTERROGATE_HEADERS} ${INTERROGATE_SOURCES}) target_link_libraries(interrogate p3cppParser p3interrogatedb p3dconfig p3prc p3dtoolutil p3dtoolbase p3pystub ${_OPENSSL_LIBRARIES}) +install(TARGETS interrogate DESTINATION bin) add_executable(interrogate_module interrogate_module.cxx) target_link_libraries(interrogate_module p3cppParser p3interrogatedb p3dconfig p3prc p3dtoolutil p3dtoolbase p3pystub ${OPENSSL_LIBRARIES}) +install(TARGETS interrogate DESTINATION bin) diff --git a/dtool/src/interrogatedb/CMakeLists.txt b/dtool/src/interrogatedb/CMakeLists.txt index 58477d2ad7..01b34cd51f 100644 --- a/dtool/src/interrogatedb/CMakeLists.txt +++ b/dtool/src/interrogatedb/CMakeLists.txt @@ -31,3 +31,5 @@ composite_sources(p3interrogatedb P3INTERROGATEDB_SOURCES) add_library(p3interrogatedb ${P3INTERROGATEDB_HEADERS} ${P3INTERROGATEDB_SOURCES}) target_link_libraries(p3interrogatedb p3dconfig ${PYTHON_LIBRARIES}) + +install(TARGETS p3interrogatedb DESTINATION lib) diff --git a/dtool/src/prc/CMakeLists.txt b/dtool/src/prc/CMakeLists.txt index 57cea800b0..ad2213024f 100644 --- a/dtool/src/prc/CMakeLists.txt +++ b/dtool/src/prc/CMakeLists.txt @@ -66,3 +66,5 @@ composite_sources(p3prc P3PRC_SOURCES) add_library(p3prc ${P3PRC_HEADERS} ${P3PRC_SOURCES}) target_link_libraries(p3prc p3dtoolutil p3dtoolbase ${_OPENSSL_LIBRARIES}) + +install(TARGETS p3prc DESTINATION lib) diff --git a/panda/metalibs/panda/CMakeLists.txt b/panda/metalibs/panda/CMakeLists.txt index cd62d585c8..3170a4717e 100644 --- a/panda/metalibs/panda/CMakeLists.txt +++ b/panda/metalibs/panda/CMakeLists.txt @@ -11,3 +11,5 @@ endif() add_library(panda panda.cxx) target_link_libraries(panda ${PANDA_LINK_TARGETS}) + +install(TARGETS panda DESTINATION lib) diff --git a/panda/metalibs/pandaegg/CMakeLists.txt b/panda/metalibs/pandaegg/CMakeLists.txt index 3d17cbfd10..a8684b4fe9 100644 --- a/panda/metalibs/pandaegg/CMakeLists.txt +++ b/panda/metalibs/pandaegg/CMakeLists.txt @@ -3,4 +3,6 @@ if(HAVE_EGG) add_library(pandaegg pandaegg.cxx) target_link_libraries(pandaegg ${PANDAEGG_LINK_TARGETS}) + + install(TARGETS pandaegg DESTINATION lib) endif() diff --git a/panda/metalibs/pandagl/CMakeLists.txt b/panda/metalibs/pandagl/CMakeLists.txt index 96eb7465cc..2134f350eb 100644 --- a/panda/metalibs/pandagl/CMakeLists.txt +++ b/panda/metalibs/pandagl/CMakeLists.txt @@ -17,4 +17,6 @@ if(HAVE_GL) add_library(pandagl pandagl.cxx) target_link_libraries(pandagl ${PANDAGL_LINK_TARGETS}) + + install(TARGETS pandagl DESTINATION lib) endif() diff --git a/panda/src/audio/CMakeLists.txt b/panda/src/audio/CMakeLists.txt index 9503acc783..b674c313f7 100644 --- a/panda/src/audio/CMakeLists.txt +++ b/panda/src/audio/CMakeLists.txt @@ -21,4 +21,6 @@ if(HAVE_AUDIO) add_library(p3audio ${P3AUDIO_HEADERS} ${P3AUDIO_SOURCES}) target_link_libraries(p3audio p3putil p3event p3movies p3linmath) target_interrogate(p3audio ALL) + + install(TARGETS p3audio DESTINATION lib) endif() diff --git a/panda/src/chan/CMakeLists.txt b/panda/src/chan/CMakeLists.txt index 53f4f64fc9..4bf13ea0c6 100644 --- a/panda/src/chan/CMakeLists.txt +++ b/panda/src/chan/CMakeLists.txt @@ -54,3 +54,5 @@ composite_sources(p3chan P3CHAN_SOURCES) add_library(p3chan ${P3CHAN_HEADERS} ${P3CHAN_SOURCES}) target_link_libraries(p3chan p3pgraph) target_interrogate(p3chan ALL) + +install(TARGETS p3chan DESTINATION lib) diff --git a/panda/src/char/CMakeLists.txt b/panda/src/char/CMakeLists.txt index 421573ed54..8196969d63 100644 --- a/panda/src/char/CMakeLists.txt +++ b/panda/src/char/CMakeLists.txt @@ -22,3 +22,5 @@ composite_sources(p3char P3CHAR_SOURCES) add_library(p3char ${P3CHAR_HEADERS} ${P3CHAR_SOURCES}) target_link_libraries(p3char p3chan) target_interrogate(p3char ALL) + +install(TARGETS p3char DESTINATION lib) diff --git a/panda/src/collide/CMakeLists.txt b/panda/src/collide/CMakeLists.txt index 3b557b981b..dd3994ff9b 100644 --- a/panda/src/collide/CMakeLists.txt +++ b/panda/src/collide/CMakeLists.txt @@ -67,6 +67,8 @@ add_library(p3collide ${P3COLLIDE_SOURCES} ${P3COLLIDE_HEADERS}) target_link_libraries(p3collide p3tform) target_interrogate(p3collide ALL) +install(TARGETS p3collide DESTINATION lib) + #begin test_bin_target #define TARGET test_collide #define LOCAL_LIBS diff --git a/panda/src/cull/CMakeLists.txt b/panda/src/cull/CMakeLists.txt index f41ca915a8..4b8001920f 100644 --- a/panda/src/cull/CMakeLists.txt +++ b/panda/src/cull/CMakeLists.txt @@ -24,3 +24,5 @@ composite_sources(p3cull P3CULL_SOURCES) add_library(p3cull ${P3CULL_HEADERS} ${P3CULL_SOURCES}) target_link_libraries(p3cull p3pgraph) target_interrogate(p3cull ALL) + +install(TARGETS p3cull DESTINATION lib) diff --git a/panda/src/device/CMakeLists.txt b/panda/src/device/CMakeLists.txt index 0b7eaedb1e..16dc4b9164 100644 --- a/panda/src/device/CMakeLists.txt +++ b/panda/src/device/CMakeLists.txt @@ -30,3 +30,5 @@ composite_sources(p3device P3DEVICE_SOURCES) add_library(p3device ${P3DEVICE_SOURCES} ${P3DEVICE_HEADERS}) target_link_libraries(p3device p3dgraph p3display) target_interrogate(p3device ALL) + +install(TARGETS p3device DESTINATION lib) diff --git a/panda/src/dgraph/CMakeLists.txt b/panda/src/dgraph/CMakeLists.txt index 0117da0334..c085c0e8e1 100644 --- a/panda/src/dgraph/CMakeLists.txt +++ b/panda/src/dgraph/CMakeLists.txt @@ -15,3 +15,5 @@ composite_sources(p3dgraph P3DGRAPH_SOURCES) add_library(p3dgraph ${P3DGRAPH_SOURCES} ${P3DGRAPH_HEADERS}) target_link_libraries(p3dgraph p3pgraph) target_interrogate(p3dgraph ALL) + +install(TARGETS p3dgraph DESTINATION lib) diff --git a/panda/src/display/CMakeLists.txt b/panda/src/display/CMakeLists.txt index b9f9813cc3..106fab5646 100644 --- a/panda/src/display/CMakeLists.txt +++ b/panda/src/display/CMakeLists.txt @@ -91,6 +91,8 @@ add_library(p3display ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES}) target_link_libraries(p3display p3cull p3pgraphnodes) target_interrogate(p3display ALL) +install(TARGETS p3display DESTINATION lib) + if(OSX_PLATFORM AND HAVE_P3D_PLUGIN) # We build a static library of just these files, so the plugin can # link with it in direct/src/plugin, without pulling in the rest of diff --git a/panda/src/downloader/CMakeLists.txt b/panda/src/downloader/CMakeLists.txt index 03c03b418d..cc4c747f92 100644 --- a/panda/src/downloader/CMakeLists.txt +++ b/panda/src/downloader/CMakeLists.txt @@ -66,3 +66,5 @@ composite_sources(p3downloader P3DOWNLOADER_SOURCES) add_library(p3downloader ${P3DOWNLOADER_SOURCES} ${P3DOWNLOADER_HEADERS}) target_link_libraries(p3downloader p3express) target_interrogate(p3downloader ALL) + +install(TARGETS p3downloader DESTINATION lib) diff --git a/panda/src/egg/CMakeLists.txt b/panda/src/egg/CMakeLists.txt index c397beb6b4..99103a9e54 100644 --- a/panda/src/egg/CMakeLists.txt +++ b/panda/src/egg/CMakeLists.txt @@ -97,4 +97,6 @@ if(HAVE_EGG) add_library(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_PARSER_SOURCES}) target_link_libraries(p3egg p3prc p3pandabase p3express p3linmath p3mathutil) target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES}) + + install(TARGETS p3egg DESTINATION lib) endif() diff --git a/panda/src/egg2pg/CMakeLists.txt b/panda/src/egg2pg/CMakeLists.txt index 877cd20e12..71d91c3365 100644 --- a/panda/src/egg2pg/CMakeLists.txt +++ b/panda/src/egg2pg/CMakeLists.txt @@ -33,4 +33,6 @@ if(HAVE_EGG) add_library(p3egg2pg ${P3EGG2PG_HEADERS} ${P3EGG2PG_SOURCES}) target_link_libraries(p3egg2pg p3parametrics p3collide p3egg p3pgraph p3chan p3char) target_interrogate(p3egg2pg ALL) + + install(TARGETS p3egg2pg DESTINATION lib) endif() diff --git a/panda/src/event/CMakeLists.txt b/panda/src/event/CMakeLists.txt index 3a3b293356..d3cc6dff51 100644 --- a/panda/src/event/CMakeLists.txt +++ b/panda/src/event/CMakeLists.txt @@ -41,6 +41,8 @@ add_library(p3event ${P3EVENT_HEADERS} ${P3EVENT_SOURCES}) target_link_libraries(p3event p3linmath p3pstatclient) target_interrogate(p3event ALL) +install(TARGETS p3event DESTINATION lib) + #begin test_bin_target #define TARGET test_task #define LOCAL_LIBS $[LOCAL_LIBS] p3mathutil @@ -51,4 +53,4 @@ target_interrogate(p3event ALL) #define SOURCES \ # test_task.cxx -#end test_bin_target \ No newline at end of file +#end test_bin_target diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt index 34645871ae..631078215f 100644 --- a/panda/src/express/CMakeLists.txt +++ b/panda/src/express/CMakeLists.txt @@ -130,6 +130,8 @@ target_link_libraries(p3express p3pandabase p3dtool p3dtoolconfig ${_TAR_LIBRARY}) target_interrogate(p3express ALL) +install(TARGETS p3express DESTINATION lib) + #add_executable(p3expressTestTypes test_types.cxx) #target_link_libraries(p3expressTestTypes p3express p3dtoolutil p3dtool p3prc p3dtoolconfig p3pystub) #add_test(p3express_test_types p3expressTestTypes) diff --git a/panda/src/framework/CMakeLists.txt b/panda/src/framework/CMakeLists.txt index 1863f00ff0..75ececfec9 100644 --- a/panda/src/framework/CMakeLists.txt +++ b/panda/src/framework/CMakeLists.txt @@ -58,3 +58,5 @@ endif() composite_sources(p3framework P3FRAMEWORK_SOURCES) add_library(p3framework ${P3FRAMEWORK_HEADERS} ${P3FRAMEWORK_SOURCES}) target_link_libraries(p3framework ${P3FRAMEWORK_LINK_TARGETS}) + +install(TARGETS p3framework DESTINATION lib) diff --git a/panda/src/glgsg/CMakeLists.txt b/panda/src/glgsg/CMakeLists.txt index 6f2fbd9aa7..676ee264eb 100644 --- a/panda/src/glgsg/CMakeLists.txt +++ b/panda/src/glgsg/CMakeLists.txt @@ -12,4 +12,6 @@ if(HAVE_GL) add_library(p3glgsg ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES}) target_link_libraries(p3glgsg p3glstuff p3display ${OPENGL_LIBRARIES} ${_CG_LIBRARIES}) + + install(TARGETS p3glgsg DESTINATION lib) endif() diff --git a/panda/src/glstuff/CMakeLists.txt b/panda/src/glstuff/CMakeLists.txt index dd983c0801..527e9e827f 100644 --- a/panda/src/glstuff/CMakeLists.txt +++ b/panda/src/glstuff/CMakeLists.txt @@ -33,4 +33,6 @@ if(HAVE_GL) composite_sources(p3glstuff P3GLSTUFF_SOURCES) add_library(p3glstuff ${P3GLSTUFF_HEADERS} ${P3GLSTUFF_SOURCES}) target_link_libraries(p3glstuff p3pandabase p3gobj) + + install(TARGETS p3glstuff DESTINATION lib) endif() diff --git a/panda/src/glxdisplay/CMakeLists.txt b/panda/src/glxdisplay/CMakeLists.txt index 975be01ad4..b7f6019786 100644 --- a/panda/src/glxdisplay/CMakeLists.txt +++ b/panda/src/glxdisplay/CMakeLists.txt @@ -23,4 +23,6 @@ if(HAVE_GLX) composite_sources(p3glxdisplay P3GLXDISPLAY_SOURCES) add_library(p3glxdisplay ${P3GLXDISPLAY_HEADERS} ${P3GLXDISPLAY_SOURCES}) target_link_libraries(p3glxdisplay p3glgsg p3x11display) + + install(TARGETS p3glxdisplay DESTINATION lib) endif() diff --git a/panda/src/gobj/CMakeLists.txt b/panda/src/gobj/CMakeLists.txt index 52ab97b586..2cdb133c77 100644 --- a/panda/src/gobj/CMakeLists.txt +++ b/panda/src/gobj/CMakeLists.txt @@ -147,6 +147,8 @@ target_link_libraries(p3gobj p3gsgbase p3pnmimage ${_ZLIB_LIBRARIES} ${_SQUISH_LIBRARY} ${_CG_LIBRARIES}) target_interrogate(p3gobj ALL) +install(TARGETS p3gobj DESTINATION lib) + #begin test_bin_target #define TARGET test_gobj #define LOCAL_LIBS \ diff --git a/panda/src/grutil/CMakeLists.txt b/panda/src/grutil/CMakeLists.txt index d4f2087cd3..cb9bfa75d8 100644 --- a/panda/src/grutil/CMakeLists.txt +++ b/panda/src/grutil/CMakeLists.txt @@ -42,3 +42,5 @@ if(HAVE_AUDIO) target_link_libraries(p3grutil p3audio) endif() target_interrogate(p3grutil ALL) + +install(TARGETS p3grutil DESTINATION lib) diff --git a/panda/src/gsgbase/CMakeLists.txt b/panda/src/gsgbase/CMakeLists.txt index 53ba50d152..8c5d8cf105 100644 --- a/panda/src/gsgbase/CMakeLists.txt +++ b/panda/src/gsgbase/CMakeLists.txt @@ -17,6 +17,8 @@ add_library(p3gsgbase ${P3GSGBASE_HEADERS} ${P3GSGBASE_SOURCES}) target_link_libraries(p3gsgbase p3linmath) target_interrogate(p3gsgbase ALL) +install(TARGETS p3gsgbase DESTINATION lib) + #begin test_bin_target #define TARGET test_gsgbase #define LOCAL_LIBS diff --git a/panda/src/linmath/CMakeLists.txt b/panda/src/linmath/CMakeLists.txt index 5b08370b99..630ea6e7ce 100644 --- a/panda/src/linmath/CMakeLists.txt +++ b/panda/src/linmath/CMakeLists.txt @@ -47,6 +47,8 @@ add_library(p3linmath ${P3LINMATH_HEADERS} ${P3LINMATH_SOURCES}) target_link_libraries(p3linmath p3putil) target_interrogate(p3linmath ALL) +install(TARGETS p3linmath DESTINATION lib) + #begin test_bin_target #define TARGET test_math #define LOCAL_LIBS \ diff --git a/panda/src/mathutil/CMakeLists.txt b/panda/src/mathutil/CMakeLists.txt index 0df4773681..7a482eda35 100644 --- a/panda/src/mathutil/CMakeLists.txt +++ b/panda/src/mathutil/CMakeLists.txt @@ -65,6 +65,8 @@ add_library(p3mathutil ${P3MATHUTIL_HEADERS} ${P3MATHUTIL_SOURCES}) target_link_libraries(p3mathutil p3event ${FFTW2_LIBRARY_DIR}) target_interrogate(p3mathutil ALL) +install(TARGETS p3mathutil DESTINATION lib) + #begin test_bin_target #define TARGET test_mathutil #define LOCAL_LIBS \ diff --git a/panda/src/movies/CMakeLists.txt b/panda/src/movies/CMakeLists.txt index 4ae884c012..3f31767fa0 100644 --- a/panda/src/movies/CMakeLists.txt +++ b/panda/src/movies/CMakeLists.txt @@ -37,3 +37,5 @@ composite_sources(p3movies P3MOVIES_SOURCES) add_library(p3movies ${P3MOVIES_HEADERS} ${P3MOVIES_SOURCES}) target_link_libraries(p3movies p3pandabase p3express p3pstatclient p3gobj p3dconfig p3prc) target_interrogate(p3movies ALL) + +install(TARGETS p3movies DESTINATION lib) diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt index 3e13361410..565d4ccb1c 100644 --- a/panda/src/nativenet/CMakeLists.txt +++ b/panda/src/nativenet/CMakeLists.txt @@ -27,4 +27,6 @@ if(WANT_NATIVE_NET) add_library(p3nativenet ${P3NATIVENET_HEADERS} ${P3NATIVENET_SOURCES}) target_link_libraries(p3nativenet p3express p3pandabase) target_interrogate(p3nativenet ALL) + + install(TARGETS p3nativenet DESTINATION lib) endif() diff --git a/panda/src/net/CMakeLists.txt b/panda/src/net/CMakeLists.txt index 9fec4780fc..68eac47634 100644 --- a/panda/src/net/CMakeLists.txt +++ b/panda/src/net/CMakeLists.txt @@ -29,4 +29,6 @@ if(HAVE_NET AND WANT_NATIVE_NET) add_library(p3net ${P3NET_HEADERS} ${P3NET_SOURCES}) target_link_libraries(p3net p3express p3downloader p3pandabase p3nativenet p3pipeline) target_interrogate(p3net ALL) + + install(TARGETS p3net DESTINATION lib) endif() diff --git a/panda/src/pandabase/CMakeLists.txt b/panda/src/pandabase/CMakeLists.txt index bcb2d1f85d..d43bb13e17 100644 --- a/panda/src/pandabase/CMakeLists.txt +++ b/panda/src/pandabase/CMakeLists.txt @@ -8,3 +8,5 @@ set(P3PANDABASE_SOURCES add_library(p3pandabase ${P3PANDABASE_HEADERS} ${P3PANDABASE_SOURCES}) target_link_libraries(p3pandabase p3dtoolbase) + +install(TARGETS p3pandabase DESTINATION lib) diff --git a/panda/src/parametrics/CMakeLists.txt b/panda/src/parametrics/CMakeLists.txt index 5b204e752b..1a61873e96 100644 --- a/panda/src/parametrics/CMakeLists.txt +++ b/panda/src/parametrics/CMakeLists.txt @@ -38,6 +38,8 @@ add_library(p3parametrics ${P3PARAMETRICS_SOURCES} ${P3PARAMETRICS_HEADERS}) target_link_libraries(p3parametrics p3pgraph) target_interrogate(p3parametrics ALL) +install(TARGETS p3parametrics DESTINATION lib) + #begin test_bin_target #define TARGET test_parametrics #define LOCAL_LIBS diff --git a/panda/src/pgraph/CMakeLists.txt b/panda/src/pgraph/CMakeLists.txt index 0eeb65dddc..c75b90c966 100644 --- a/panda/src/pgraph/CMakeLists.txt +++ b/panda/src/pgraph/CMakeLists.txt @@ -201,6 +201,8 @@ add_library(p3pgraph ${P3PGRAPH_HEADERS} ${P3PGRAPH_SOURCES}) target_link_libraries(p3pgraph p3gobj p3event p3gsgbase p3putil p3linmath p3downloader) target_interrogate(p3pgraph ALL) +install(TARGETS p3pgraph DESTINATION lib) + #begin test_bin_target #define TARGET test_pgraph diff --git a/panda/src/pgraphnodes/CMakeLists.txt b/panda/src/pgraphnodes/CMakeLists.txt index 22961aa9f1..1f42f992e4 100644 --- a/panda/src/pgraphnodes/CMakeLists.txt +++ b/panda/src/pgraphnodes/CMakeLists.txt @@ -42,3 +42,5 @@ composite_sources(p3pgraphnodes P3PGRAPHNODES_SOURCES) add_library(p3pgraphnodes ${P3PGRAPHNODES_HEADERS} ${P3PGRAPHNODES_SOURCES}) target_link_libraries(p3pgraphnodes p3pgraph) target_interrogate(p3pgraphnodes ALL) + +install(TARGETS p3pgraphnodes DESTINATION lib) diff --git a/panda/src/pgui/CMakeLists.txt b/panda/src/pgui/CMakeLists.txt index 55839744cb..15bbfdb736 100644 --- a/panda/src/pgui/CMakeLists.txt +++ b/panda/src/pgui/CMakeLists.txt @@ -44,6 +44,8 @@ add_library(p3pgui ${P3PGUI_SOURCES} ${P3PGUI_HEADERS}) target_link_libraries(p3pgui p3tform) target_interrogate(p3pgui ALL) +install(TARGETS p3pgui DESTINATION lib) + #begin test_bin_target #define TARGET test_pgentry diff --git a/panda/src/pipeline/CMakeLists.txt b/panda/src/pipeline/CMakeLists.txt index 2f008e5d41..29e5dfc586 100644 --- a/panda/src/pipeline/CMakeLists.txt +++ b/panda/src/pipeline/CMakeLists.txt @@ -140,6 +140,8 @@ add_library(p3pipeline ${P3PIPELINE_HEADERS} ${P3PIPELINE_SOURCES}) target_link_libraries(p3pipeline p3express) target_interrogate(p3pipeline ALL) +install(TARGETS p3pipeline DESTINATION lib) + #begin test_bin_target #define TARGET test_threaddata #define LOCAL_LIBS $[LOCAL_LIBS] p3pipeline diff --git a/panda/src/pnmimage/CMakeLists.txt b/panda/src/pnmimage/CMakeLists.txt index e23f01f69a..52f6246a2d 100644 --- a/panda/src/pnmimage/CMakeLists.txt +++ b/panda/src/pnmimage/CMakeLists.txt @@ -28,3 +28,5 @@ composite_sources(p3pnmimage P3PNMIMAGE_SOURCES) add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES}) target_link_libraries(p3pnmimage p3mathutil) target_interrogate(p3pnmimage ALL) + +install(TARGETS p3pnmimage DESTINATION lib) diff --git a/panda/src/pnmimagetypes/CMakeLists.txt b/panda/src/pnmimagetypes/CMakeLists.txt index 295cba0ddb..680b767ecb 100644 --- a/panda/src/pnmimagetypes/CMakeLists.txt +++ b/panda/src/pnmimagetypes/CMakeLists.txt @@ -30,3 +30,5 @@ composite_sources(p3pnmimagetypes P3PNMIMAGETYPES_SOURCES) add_library(p3pnmimagetypes ${P3PNMIMAGETYPES_HEADERS} ${P3PNMIMAGETYPES_SOURCES}) target_link_libraries(p3pnmimagetypes p3pnmimage ${_JPEG_LIBRARIES} ${_TIFF_LIBRARIES} ${_PNG_LIBRARIES}) + +install(TARGETS p3pnmimagetypes DESTINATION lib) diff --git a/panda/src/pnmtext/CMakeLists.txt b/panda/src/pnmtext/CMakeLists.txt index 534b9a80e3..9af9df2714 100644 --- a/panda/src/pnmtext/CMakeLists.txt +++ b/panda/src/pnmtext/CMakeLists.txt @@ -17,3 +17,5 @@ composite_sources(p3pnmtext P3PNMTEXT_SOURCES) add_library(p3pnmtext ${P3PNMTEXT_SOURCES} ${P3PNMTEXT_HEADERS}) target_link_libraries(p3pnmtext p3pnmimage ${_FREETYPE_LIBRARIES}) target_interrogate(p3pnmtext ALL) + +install(TARGETS p3pnmtext DESTINATION lib) diff --git a/panda/src/pstatclient/CMakeLists.txt b/panda/src/pstatclient/CMakeLists.txt index 13f8e8ae3d..007e73d03c 100644 --- a/panda/src/pstatclient/CMakeLists.txt +++ b/panda/src/pstatclient/CMakeLists.txt @@ -27,6 +27,8 @@ add_library(p3pstatclient ${P3PSTATCLIENT_HEADERS} ${P3PSTATCLIENT_SOURCES}) target_link_libraries(p3pstatclient p3putil) target_interrogate(p3pstatclient ALL) +install(TARGETS p3pstatclient DESTINATION lib) + #begin test_bin_target #define LOCAL_LIBS \ # p3pstatclient diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt index c77cac1d7d..116522b457 100644 --- a/panda/src/putil/CMakeLists.txt +++ b/panda/src/putil/CMakeLists.txt @@ -117,6 +117,8 @@ add_library(p3putil ${P3PUTIL_HEADERS} ${P3PUTIL_SOURCES}) target_link_libraries(p3putil p3pipeline) target_interrogate(p3putil ALL) +install(TARGETS p3putil DESTINATION lib) + #begin test_bin_target #define TARGET test_bamRead #define LOCAL_LIBS diff --git a/panda/src/recorder/CMakeLists.txt b/panda/src/recorder/CMakeLists.txt index 8289ef7ecb..8590e3ab83 100644 --- a/panda/src/recorder/CMakeLists.txt +++ b/panda/src/recorder/CMakeLists.txt @@ -20,3 +20,5 @@ composite_sources(p3recorder P3RECORDER_SOURCES) add_library(p3recorder ${P3RECORDER_SOURCES} ${P3RECORDER_HEADERS}) target_link_libraries(p3recorder p3dgraph p3downloader) target_interrogate(p3recorder ALL) + +install(TARGETS p3recorder DESTINATION lib) diff --git a/panda/src/testbed/CMakeLists.txt b/panda/src/testbed/CMakeLists.txt index e7b659bb17..21e15e788c 100644 --- a/panda/src/testbed/CMakeLists.txt +++ b/panda/src/testbed/CMakeLists.txt @@ -1,5 +1,6 @@ add_executable(pview pview.cxx) target_link_libraries(pview p3framework p3pystub) +install(TARGETS pview DESTINATION bin) #begin test_bin_target #define TARGET pgrid diff --git a/panda/src/text/CMakeLists.txt b/panda/src/text/CMakeLists.txt index 1815b6e529..5bbe2e8ef1 100644 --- a/panda/src/text/CMakeLists.txt +++ b/panda/src/text/CMakeLists.txt @@ -36,3 +36,5 @@ composite_sources(p3text P3TEXT_SOURCES) add_library(p3text ${P3TEXT_SOURCES} ${P3TEXT_HEADERS}) target_link_libraries(p3text p3pnmtext p3parametrics ${_FREETYPE_LIBRARIES}) target_interrogate(p3text ALL) + +install(TARGETS p3text DESTINATION lib) diff --git a/panda/src/tform/CMakeLists.txt b/panda/src/tform/CMakeLists.txt index 1de7ffe237..abc730148b 100644 --- a/panda/src/tform/CMakeLists.txt +++ b/panda/src/tform/CMakeLists.txt @@ -28,3 +28,5 @@ composite_sources(p3tform P3TFORM_SOURCES) add_library(p3tform ${P3TFORM_SOURCES} ${P3TFORM_HEADERS}) target_link_libraries(p3tform p3device p3grutil) target_interrogate(p3tform ALL) + +install(TARGETS p3tform DESTINATION lib) diff --git a/panda/src/x11display/CMakeLists.txt b/panda/src/x11display/CMakeLists.txt index bae6e338fc..8c66448497 100644 --- a/panda/src/x11display/CMakeLists.txt +++ b/panda/src/x11display/CMakeLists.txt @@ -11,4 +11,6 @@ if(HAVE_X11) composite_sources(p3x11display P3X11DISPLAY_SOURCES) add_library(p3x11display ${P3X11DISPLAY_HEADERS} ${P3X11DISPLAY_SOURCES}) target_link_libraries(p3x11display p3display ${X11_LIBRARIES}) + + install(TARGETS p3x11display DESTINATION lib) endif()