TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Use target_use_packages where appropriate

Browse Source
This commit is contained in:
Sam Edwards 2018-02-04 09:59:16 -07:00
parent 54dad6c72a
commit 34f5674ae5
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/audiotraits/CMakeLists.txt
View File

@ -18,8 +18,8 @@ if(HAVE_AUDIO)
composite_sources(p3miles_audio P3MILES_SOURCES) composite_sources(p3miles_audio P3MILES_SOURCES)
include_directories(${MILES_INCLUDE_DIR}) include_directories(${MILES_INCLUDE_DIR})
add_library(p3miles_audio ${P3MILES_HEADERS} ${P3MILES_SOURCES}) add_library(p3miles_audio ${P3MILES_HEADERS} ${P3MILES_SOURCES})
target_link_libraries(p3miles_audio p3audio p3event p3pipeline target_link_libraries(p3miles_audio p3audio p3event p3pipeline)
${_MILES_LIBRARY}) target_use_packages(p3miles_audio MILES)
install(TARGETS p3miles_audio DESTINATION lib) install(TARGETS p3miles_audio DESTINATION lib)
endif() endif()
@ -36,8 +36,8 @@ if(HAVE_AUDIO)
composite_sources(p3fmod_audio P3FMOD_SOURCES) composite_sources(p3fmod_audio P3FMOD_SOURCES)
include_directories(${FMODEX_INCLUDE_DIR}) include_directories(${FMODEX_INCLUDE_DIR})
add_library(p3fmod_audio ${P3FMOD_HEADERS} ${P3FMOD_SOURCES}) add_library(p3fmod_audio ${P3FMOD_HEADERS} ${P3FMOD_SOURCES})
target_link_libraries(p3fmod_audio p3audio p3event target_link_libraries(p3fmod_audio p3audio p3event)
${_FMODEX_LIBRARY}) target_use_packages(p3fmod_audio FMODEX)
install(TARGETS p3fmod_audio DESTINATION lib) install(TARGETS p3fmod_audio DESTINATION lib)
endif() endif()
@ -55,8 +55,8 @@ if(HAVE_AUDIO)
composite_sources(p3openal_audio P3OPENAL_SOURCES) composite_sources(p3openal_audio P3OPENAL_SOURCES)
include_directories(${OPENAL_INCLUDE_DIR}) include_directories(${OPENAL_INCLUDE_DIR})
add_library(p3openal_audio ${P3OPENAL_HEADERS} ${P3OPENAL_SOURCES}) add_library(p3openal_audio ${P3OPENAL_HEADERS} ${P3OPENAL_SOURCES})
target_link_libraries(p3openal_audio p3audio p3event target_link_libraries(p3openal_audio p3audio p3event)
${_OPENAL_LIBRARY}) target_use_packages(p3openal_audio OPENAL)
install(TARGETS p3openal_audio DESTINATION lib) install(TARGETS p3openal_audio DESTINATION lib)
endif() endif()

4
panda/src/express/CMakeLists.txt
View File

@ -156,8 +156,8 @@ else()
target_include_directories(p3express PUBLIC target_include_directories(p3express PUBLIC
$<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>) $<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>)
endif() endif()
target_link_libraries(p3express p3pandabase p3dtool p3prc p3dconfig target_link_libraries(p3express p3pandabase p3dtool p3prc p3dconfig)
${_TAR_LIBRARY} ${_ZLIB_LIBRARY}) target_use_packages(p3express TAR ZLIB)
target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT}) target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT})
if(WIN32) if(WIN32)

3
panda/src/glgsg/CMakeLists.txt
View File

@ -11,7 +11,8 @@ if(HAVE_GL)
composite_sources(p3glgsg P3GLGSG_SOURCES) composite_sources(p3glgsg P3GLGSG_SOURCES)
add_library(p3glgsg ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES}) add_library(p3glgsg ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES})
target_link_libraries(p3glgsg p3glstuff p3display target_link_libraries(p3glgsg p3glstuff p3display
${OPENGL_LIBRARIES} ${_CG_LIBRARIES}) ${OPENGL_LIBRARIES})
target_use_packages(p3glgsg CG)
install(TARGETS p3glgsg DESTINATION lib) install(TARGETS p3glgsg DESTINATION lib)
install(FILES ${P3GLGSG_HEADERS} DESTINATION include/panda3d) install(FILES ${P3GLGSG_HEADERS} DESTINATION include/panda3d)

4
panda/src/gobj/CMakeLists.txt
View File

@ -161,8 +161,8 @@ set(P3GOBJ_IGATEEXT
composite_sources(p3gobj P3GOBJ_SOURCES) composite_sources(p3gobj P3GOBJ_SOURCES)
add_library(p3gobj ${P3GOBJ_HEADERS} ${P3GOBJ_SOURCES}) add_library(p3gobj ${P3GOBJ_HEADERS} ${P3GOBJ_SOURCES})
target_link_libraries(p3gobj p3gsgbase p3pnmimage target_link_libraries(p3gobj p3gsgbase p3pnmimage)
${_ZLIB_LIBRARIES} ${_SQUISH_LIBRARY} ${_CG_LIBRARY}) target_use_packages(p3gobj ZLIB SQUISH CG)
target_interrogate(p3gobj ALL EXTENSIONS ${P3GOBJ_IGATEEXT}) target_interrogate(p3gobj ALL EXTENSIONS ${P3GOBJ_IGATEEXT})
install(TARGETS p3gobj DESTINATION lib) install(TARGETS p3gobj DESTINATION lib)

4
panda/src/pnmimagetypes/CMakeLists.txt
View File

@ -32,7 +32,7 @@ set(P3PNMIMAGETYPES_SOURCES
composite_sources(p3pnmimagetypes P3PNMIMAGETYPES_SOURCES) composite_sources(p3pnmimagetypes P3PNMIMAGETYPES_SOURCES)
add_library(p3pnmimagetypes ${P3PNMIMAGETYPES_HEADERS} ${P3PNMIMAGETYPES_SOURCES}) add_library(p3pnmimagetypes ${P3PNMIMAGETYPES_HEADERS} ${P3PNMIMAGETYPES_SOURCES})
target_link_libraries(p3pnmimagetypes p3pnmimage ${_JPEG_LIBRARIES} target_link_libraries(p3pnmimagetypes p3pnmimage)
${_TIFF_LIBRARIES} ${_PNG_LIBRARIES}) target_use_packages(p3pnmimagetypes JPEG TIFF PNG)
install(TARGETS p3pnmimagetypes DESTINATION lib) install(TARGETS p3pnmimagetypes DESTINATION lib)

3
panda/src/pnmtext/CMakeLists.txt
View File

@ -16,7 +16,8 @@ if(HAVE_FREETYPE)
composite_sources(p3pnmtext P3PNMTEXT_SOURCES) composite_sources(p3pnmtext P3PNMTEXT_SOURCES)
add_library(p3pnmtext ${P3PNMTEXT_HEADERS} ${P3PNMTEXT_SOURCES}) add_library(p3pnmtext ${P3PNMTEXT_HEADERS} ${P3PNMTEXT_SOURCES})
target_link_libraries(p3pnmtext p3parametrics p3pnmimage ${_FREETYPE_LIBRARIES}) target_link_libraries(p3pnmtext p3parametrics p3pnmimage)
target_use_packages(p3pnmtext FREETYPE)
target_interrogate(p3pnmtext ALL) target_interrogate(p3pnmtext ALL)
install(TARGETS p3pnmtext DESTINATION lib) install(TARGETS p3pnmtext DESTINATION lib)

2
panda/src/text/CMakeLists.txt
View File

@ -36,7 +36,7 @@ composite_sources(p3text P3TEXT_SOURCES)
add_library(p3text ${P3TEXT_HEADERS} ${P3TEXT_SOURCES}) add_library(p3text ${P3TEXT_HEADERS} ${P3TEXT_SOURCES})
target_link_libraries(p3text p3parametrics) target_link_libraries(p3text p3parametrics)
if(HAVE_FREETYPE) if(HAVE_FREETYPE)
target_link_libraries(p3text p3pnmtext ${_FREETYPE_LIBRARIES}) target_link_libraries(p3text p3pnmtext)
endif() endif()
target_interrogate(p3text ALL) target_interrogate(p3text ALL)