diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt index 6dca5eb2bf..851461e64f 100644 --- a/panda/CMakeLists.txt +++ b/panda/CMakeLists.txt @@ -73,6 +73,7 @@ add_subdirectory(src/ode) # Include panda metalibs add_subdirectory(metalibs/panda) +add_subdirectory(metalibs/pandaexpress) add_subdirectory(metalibs/pandagl) add_subdirectory(metalibs/pandaegg) add_subdirectory(metalibs/pandaphysics) diff --git a/panda/metalibs/panda/CMakeLists.txt b/panda/metalibs/panda/CMakeLists.txt index 0dc43b6c7f..a628fe3ad6 100644 --- a/panda/metalibs/panda/CMakeLists.txt +++ b/panda/metalibs/panda/CMakeLists.txt @@ -1,6 +1,6 @@ set(PANDA_LINK_TARGETS - p3chan p3char p3collide p3cull p3device p3dgraph p3display p3downloader p3dxml - p3event p3express p3gobj p3grutil p3gsgbase p3linmath p3mathutil p3nativenet + p3chan p3char p3collide p3cull p3device p3dgraph p3display p3dxml + p3event p3gobj p3grutil p3gsgbase p3linmath p3mathutil p3nativenet p3net p3movies p3parametrics p3pgraph p3pgraphnodes p3pgui p3pipeline p3pnmimage p3pnmimagetypes p3pstatclient p3putil p3recorder p3text p3tform) @@ -12,6 +12,5 @@ if(HAVE_FREETYPE) endif() add_metalib(panda INIT init_libpanda panda.h COMPONENTS ${PANDA_LINK_TARGETS}) -set_target_properties(panda PROPERTIES DEFINE_SYMBOL BUILDING_LIBPANDA) install(TARGETS panda DESTINATION lib) diff --git a/panda/metalibs/pandaexpress/CMakeLists.txt b/panda/metalibs/pandaexpress/CMakeLists.txt new file mode 100644 index 0000000000..75fa8c7438 --- /dev/null +++ b/panda/metalibs/pandaexpress/CMakeLists.txt @@ -0,0 +1,5 @@ +add_metalib(pandaexpress + INIT init_libpandaexpress pandaexpress.h + COMPONENTS p3downloader p3express) + +install(TARGETS pandaexpress DESTINATION lib) diff --git a/panda/src/downloader/CMakeLists.txt b/panda/src/downloader/CMakeLists.txt index 7da60c6fd4..023acf2db5 100644 --- a/panda/src/downloader/CMakeLists.txt +++ b/panda/src/downloader/CMakeLists.txt @@ -70,7 +70,7 @@ set(P3DOWNLOADER_IGATEEXT composite_sources(p3downloader P3DOWNLOADER_SOURCES) add_component_library(p3downloader SYMBOL BUILDING_PANDA_DOWNLOADER ${P3DOWNLOADER_HEADERS} ${P3DOWNLOADER_SOURCES}) -target_link_libraries(p3downloader p3express p3pipeline) +target_link_libraries(p3downloader p3express) target_interrogate(p3downloader ALL EXTENSIONS ${P3DOWNLOADER_IGATEEXT}) install(TARGETS p3downloader DESTINATION lib) diff --git a/panda/src/dxml/CMakeLists.txt b/panda/src/dxml/CMakeLists.txt index 9268eb0051..82db1ef516 100644 --- a/panda/src/dxml/CMakeLists.txt +++ b/panda/src/dxml/CMakeLists.txt @@ -14,7 +14,7 @@ composite_sources(p3dxml P3DXML_SOURCES) add_definitions(-DTIXML_USE_STL) add_component_library(p3dxml SYMBOL BUILDING_PANDA_DXML ${P3DXML_HEADERS} ${P3DXML_SOURCES}) -target_link_libraries(p3dxml p3express) +target_link_libraries(p3dxml pandaexpress) target_interrogate(p3dxml ALL) install(TARGETS p3dxml DESTINATION lib) diff --git a/panda/src/linmath/CMakeLists.txt b/panda/src/linmath/CMakeLists.txt index 922c94537b..5157a0d38b 100644 --- a/panda/src/linmath/CMakeLists.txt +++ b/panda/src/linmath/CMakeLists.txt @@ -46,7 +46,7 @@ set(P3LINMATH_SOURCES composite_sources(p3linmath P3LINMATH_SOURCES) add_component_library(p3linmath SYMBOL BUILDING_PANDA_LINMATH ${P3LINMATH_HEADERS} ${P3LINMATH_SOURCES}) -target_link_libraries(p3linmath p3express p3pandabase) +target_link_libraries(p3linmath p3pandabase pandaexpress) target_use_packages(p3linmath EIGEN) target_interrogate(p3linmath ALL) diff --git a/panda/src/movies/CMakeLists.txt b/panda/src/movies/CMakeLists.txt index 9369d9beaf..49668ffc48 100644 --- a/panda/src/movies/CMakeLists.txt +++ b/panda/src/movies/CMakeLists.txt @@ -44,7 +44,7 @@ set(P3MOVIES_SOURCES composite_sources(p3movies P3MOVIES_SOURCES) add_component_library(p3movies SYMBOL BUILDING_PANDA_MOVIES ${P3MOVIES_HEADERS} ${P3MOVIES_SOURCES}) -target_link_libraries(p3movies p3pstatclient p3gobj p3express p3pandabase) +target_link_libraries(p3movies p3pstatclient p3gobj p3pandabase pandaexpress) target_interrogate(p3movies ALL) install(TARGETS p3movies DESTINATION lib) diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt index 2c2fc687ca..7cdde96ce8 100644 --- a/panda/src/nativenet/CMakeLists.txt +++ b/panda/src/nativenet/CMakeLists.txt @@ -30,7 +30,7 @@ set(P3NATIVENET_SOURCES composite_sources(p3nativenet P3NATIVENET_SOURCES) add_component_library(p3nativenet SYMBOL BUILDING_PANDA_NATIVENET ${P3NATIVENET_HEADERS} ${P3NATIVENET_SOURCES}) -target_link_libraries(p3nativenet p3express p3pandabase p3downloader) +target_link_libraries(p3nativenet p3pandabase pandaexpress) target_interrogate(p3nativenet ALL) install(TARGETS p3nativenet DESTINATION lib) diff --git a/panda/src/net/CMakeLists.txt b/panda/src/net/CMakeLists.txt index adc9f9f4ad..ba265cc86b 100644 --- a/panda/src/net/CMakeLists.txt +++ b/panda/src/net/CMakeLists.txt @@ -31,7 +31,7 @@ set(P3NET_SOURCES composite_sources(p3net P3NET_SOURCES) add_component_library(p3net SYMBOL BUILDING_PANDA_NET ${P3NET_HEADERS} ${P3NET_SOURCES}) -target_link_libraries(p3net p3express p3downloader p3pandabase p3nativenet p3pipeline) +target_link_libraries(p3net p3nativenet p3pipeline p3pandabase pandaexpress) target_interrogate(p3net ALL) if(WIN32) diff --git a/panda/src/pipeline/CMakeLists.txt b/panda/src/pipeline/CMakeLists.txt index 4040c58a19..73d7f96ce4 100644 --- a/panda/src/pipeline/CMakeLists.txt +++ b/panda/src/pipeline/CMakeLists.txt @@ -130,7 +130,7 @@ set(P3PIPELINE_IGATEEXT composite_sources(p3pipeline P3PIPELINE_SOURCES) add_component_library(p3pipeline SYMBOL BUILDING_PANDA_PIPELINE ${P3PIPELINE_HEADERS} ${P3PIPELINE_SOURCES}) -target_link_libraries(p3pipeline p3express) +target_link_libraries(p3pipeline pandaexpress) target_interrogate(p3pipeline ALL EXTENSIONS ${P3PIPELINE_IGATEEXT}) install(TARGETS p3pipeline DESTINATION lib) diff --git a/panda/src/pstatclient/CMakeLists.txt b/panda/src/pstatclient/CMakeLists.txt index 809c5b2ede..8aa80f0566 100644 --- a/panda/src/pstatclient/CMakeLists.txt +++ b/panda/src/pstatclient/CMakeLists.txt @@ -23,7 +23,7 @@ set(P3PSTATCLIENT_SOURCES composite_sources(p3pstatclient P3PSTATCLIENT_SOURCES) add_component_library(p3pstatclient SYMBOL BUILDING_PANDA_PSTATCLIENT ${P3PSTATCLIENT_HEADERS} ${P3PSTATCLIENT_SOURCES}) -target_link_libraries(p3pstatclient p3net p3putil p3express) +target_link_libraries(p3pstatclient p3net p3putil pandaexpress) target_interrogate(p3pstatclient ALL) install(TARGETS p3pstatclient DESTINATION lib)