RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmake: Always be consistent with putting headers before sources.

This commit is contained in:
Sam Edwards 2014-04-16 06:06:24 -06:00
parent 127dfe7c4d
commit 1f02b2da01
17 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
direct/src/dcparser/CMakeLists.txt
View File

@ -46,10 +46,10 @@ set(P3DCPARSER_PARSER_SOURCES
dcLexer.cxx)
composite_sources(p3dcparser P3DCPARSER_SOURCES)
add_library(p3dcparser ${P3DCPARSER_SOURCES} ${P3DCPARSER_HEADERS}
add_library(p3dcparser ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES}
${P3DCPARSER_PARSER_SOURCES})
set_target_properties(p3dcparser PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA)
target_link_libraries(p3dcparser p3directbase p3express p3pstatclient p3prc)
target_interrogate(p3dcparser ${P3DCPARSER_SOURCES} ${P3DCPARSER_HEADERS})
target_interrogate(p3dcparser ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES})
install(TARGETS p3dcparser DESTINATION lib)

2
direct/src/directbase/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(P3DIRECTBASE_HEADERS
)
# Not worth compositing sources, there's really only one.
add_library(p3directbase ${P3DIRECTBASE_SOURCES} ${P3DIRECTBASE_HEADERS})
add_library(p3directbase ${P3DIRECTBASE_HEADERS} ${P3DIRECTBASE_SOURCES})
target_link_libraries(p3directbase p3pandabase)
install(TARGETS p3directbase DESTINATION lib)

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

@ -16,7 +16,7 @@ if(APPLE AND HAVE_GL AND HAVE_COCOA)
cocoaPandaWindowDelegate.mm)
#composite_sources(p3cocoadisplay P3COCOADISPLAY_SOURCES)
add_library(p3cocoadisplay ${P3COCOADISPLAY_SOURCES} ${P3COCOADISPLAY_HEADERS})
add_library(p3cocoadisplay ${P3COCOADISPLAY_HEADERS} ${P3COCOADISPLAY_SOURCES})
target_link_libraries(p3cocoadisplay p3display p3putil p3glgsg)
# Frameworks:

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

@ -63,7 +63,7 @@ set(P3COLLIDE_SOURCES
)
composite_sources(p3collide P3COLLIDE_SOURCES)
add_library(p3collide ${P3COLLIDE_SOURCES} ${P3COLLIDE_HEADERS})
add_library(p3collide ${P3COLLIDE_HEADERS} ${P3COLLIDE_SOURCES})
target_link_libraries(p3collide p3tform)
target_interrogate(p3collide ALL)

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

@ -27,7 +27,7 @@ set(P3DEVICE_SOURCES
)
composite_sources(p3device P3DEVICE_SOURCES)
add_library(p3device ${P3DEVICE_SOURCES} ${P3DEVICE_HEADERS})
add_library(p3device ${P3DEVICE_HEADERS} ${P3DEVICE_SOURCES})
target_link_libraries(p3device p3dgraph p3display)
target_interrogate(p3device ALL)

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

@ -12,7 +12,7 @@ set(P3DGRAPH_SOURCES
)
composite_sources(p3dgraph P3DGRAPH_SOURCES)
add_library(p3dgraph ${P3DGRAPH_SOURCES} ${P3DGRAPH_HEADERS})
add_library(p3dgraph ${P3DGRAPH_HEADERS} ${P3DGRAPH_SOURCES})
target_link_libraries(p3dgraph p3pgraph)
target_interrogate(p3dgraph ALL)

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

@ -63,7 +63,7 @@ set(P3DOWNLOADER_SOURCES
)
composite_sources(p3downloader P3DOWNLOADER_SOURCES)
add_library(p3downloader ${P3DOWNLOADER_SOURCES} ${P3DOWNLOADER_HEADERS})
add_library(p3downloader ${P3DOWNLOADER_HEADERS} ${P3DOWNLOADER_SOURCES})
target_link_libraries(p3downloader p3express)
target_interrogate(p3downloader ALL)

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

@ -133,7 +133,7 @@ set(P3EXPRESS_IGATEEXT
composite_sources(p3express P3EXPRESS_SOURCES)
add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS} ${P3EXPRESS_IGATEEXT})
add_library(p3express ${P3EXPRESS_HEADERS} ${P3EXPRESS_SOURCES} ${P3EXPRESS_IGATEEXT})
target_link_libraries(p3express p3pandabase p3dtool p3dtoolconfig
${_TAR_LIBRARY} ${_ZLIB_LIBRARY})
target_interrogate(p3express ALL)

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

@ -36,7 +36,7 @@ set(P3GRUTIL_SOURCES
)
composite_sources(p3grutil P3GRUTIL_SOURCES)
add_library(p3grutil ${P3GRUTIL_SOURCES} ${P3GRUTIL_HEADERS})
add_library(p3grutil ${P3GRUTIL_HEADERS} ${P3GRUTIL_SOURCES})
target_link_libraries(p3grutil p3display p3text p3movies)
if(HAVE_AUDIO)
target_link_libraries(p3grutil p3audio)

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

@ -81,7 +81,7 @@ if(HAVE_ODE)
list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeHelperStructs.h")
composite_sources(p3ode P3ODE_SOURCES)
add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS} ${P3ODE_IGATEEXT})
add_library(p3ode ${P3ODE_HEADERS} ${P3ODE_SOURCES} ${P3ODE_IGATEEXT})
set_target_properties(p3ode PROPERTIES COMPILE_DEFINITIONS dSINGLE)
target_link_libraries(p3ode p3pgraph p3physics ${ODE_LIBRARY})
target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} ${P3ODE_IGATEEXT})

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

@ -10,7 +10,7 @@ if(APPLE AND HAVE_GL AND HAVE_CARBON)
osxGraphicsBuffer.cxx)
composite_sources(p3osxdisplay P3OSXDISPLAY_SOURCES)
add_library(p3osxdisplay ${P3OSXDISPLAY_SOURCES} ${P3OSXDISPLAY_HEADERS})
add_library(p3osxdisplay ${P3OSXDISPLAY_HEADERS} ${P3OSXDISPLAY_SOURCES})
target_link_libraries(p3osxdisplay p3display p3putil p3glgsg)
# Frameworks:

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

@ -34,7 +34,7 @@ set(P3PARAMETRICS_SOURCES
)
composite_sources(p3parametrics P3PARAMETRICS_SOURCES)
add_library(p3parametrics ${P3PARAMETRICS_SOURCES} ${P3PARAMETRICS_HEADERS})
add_library(p3parametrics ${P3PARAMETRICS_HEADERS} ${P3PARAMETRICS_SOURCES})
target_link_libraries(p3parametrics p3pgraph)
target_interrogate(p3parametrics ALL)

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

@ -40,7 +40,7 @@ set(P3PGUI_SOURCES
)
composite_sources(p3pgui P3PGUI_SOURCES)
add_library(p3pgui ${P3PGUI_SOURCES} ${P3PGUI_HEADERS})
add_library(p3pgui ${P3PGUI_HEADERS} ${P3PGUI_SOURCES})
target_link_libraries(p3pgui p3tform)
target_interrogate(p3pgui ALL)

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

@ -15,7 +15,7 @@ if(HAVE_FREETYPE)
)
composite_sources(p3pnmtext P3PNMTEXT_SOURCES)
add_library(p3pnmtext ${P3PNMTEXT_SOURCES} ${P3PNMTEXT_HEADERS})
add_library(p3pnmtext ${P3PNMTEXT_HEADERS} ${P3PNMTEXT_SOURCES})
target_link_libraries(p3pnmtext p3pnmimage ${_FREETYPE_LIBRARIES})
target_interrogate(p3pnmtext ALL)

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

@ -17,7 +17,7 @@ set(P3RECORDER_SOURCES
)
composite_sources(p3recorder P3RECORDER_SOURCES)
add_library(p3recorder ${P3RECORDER_SOURCES} ${P3RECORDER_HEADERS})
add_library(p3recorder ${P3RECORDER_HEADERS} ${P3RECORDER_SOURCES})
target_link_libraries(p3recorder p3dgraph p3downloader)
target_interrogate(p3recorder ALL)

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

@ -33,7 +33,7 @@ set(P3TEXT_SOURCES
)
composite_sources(p3text P3TEXT_SOURCES)
add_library(p3text ${P3TEXT_SOURCES} ${P3TEXT_HEADERS})
add_library(p3text ${P3TEXT_HEADERS} ${P3TEXT_SOURCES})
target_link_libraries(p3text p3parametrics)
if(HAVE_FREETYPE)
target_link_libraries(p3text p3pnmtext ${_FREETYPE_LIBRARIES})

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

@ -25,7 +25,7 @@ set(P3TFORM_SOURCES
)
composite_sources(p3tform P3TFORM_SOURCES)
add_library(p3tform ${P3TFORM_SOURCES} ${P3TFORM_HEADERS})
add_library(p3tform ${P3TFORM_HEADERS} ${P3TFORM_SOURCES})
target_link_libraries(p3tform p3device p3grutil)
target_interrogate(p3tform ALL)