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

Massively clean up CMakeLists files by removing use of ${CMAKE_CURRENT_LIST_DIR}; this is handled by add_subdirectory instead.

This commit is contained in:
Sam Edwards 2013-11-29 02:19:41 -07:00
parent 8abd710616
commit 163cbe4ea2
8 changed files with 41 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/CMakeLists.txt
View File

@ -35,7 +35,7 @@ set(DTOOL_INSTALL "${INSTALL_DIR}" CACHE STRING "The directory in which to insta
set(DEFAULT_PRC_DIR "${INSTALL_DIR}/etc" CACHE STRING "Panda uses prc files for runtime configuration. Panda will search the default .prc directory if the PRC_PATH and PRC_DIR environment variables are not defined.")
include(${CMAKE_CURRENT_LIST_DIR}/Configure.cmake)
include(Configure.cmake)
## Include dtool subpackages ##
add_subdirectory(src/dtoolbase)

2
dtool/Configure.cmake
View File

@ -396,5 +396,5 @@ else()
set(DEFAULT_PATHSEP ":")
endif()
configure_file(${CMAKE_CURRENT_LIST_DIR}/dtool_config.h.cmake ${CMAKE_BINARY_DIR}/include/dtool_config.h)
configure_file(dtool_config.h.cmake ${CMAKE_BINARY_DIR}/include/dtool_config.h)
include_directories("${CMAKE_BINARY_DIR}/include")

2
dtool/metalibs/dtool/CMakeLists.txt
View File

@ -1,2 +1,2 @@
add_library(p3dtool ${CMAKE_CURRENT_LIST_DIR}/dtool.cxx)
add_library(p3dtool dtool.cxx)
target_link_libraries(p3dtool p3dtoolutil p3dtoolbase)

21
dtool/src/cppparser/CMakeLists.txt
View File

@ -1,7 +1,7 @@
include_directories(${CMAKE_CURRENT_LIST_DIR}/../dtoolutil)
include_directories(${CMAKE_CURRENT_LIST_DIR}/../dtoolbase)
include_directories(../dtoolutil)
include_directories(../dtoolbase)
set(P3CPPPARSER_HEADER_FILES
set(P3CPPPARSER_HEADERS
cppArrayType.h cppBison.yxx cppBisonDefs.h
cppClassTemplateParameter.h cppCommentBlock.h cppConstType.h
cppDeclaration.h cppEnumType.h cppExpression.h
@ -17,7 +17,7 @@ set(P3CPPPARSER_HEADER_FILES
cppType.h cppTypeDeclaration.h cppTypeParser.h
cppTypeProxy.h cppTypedef.h cppUsing.h cppVisibility.h)
set(P3CPPPARSER_SOURCE_FILES
set(P3CPPPARSER_SOURCES
cppArrayType.cxx cppBison.cxx cppClassTemplateParameter.cxx
cppCommentBlock.cxx cppConstType.cxx cppDeclaration.cxx
cppEnumType.cxx cppExpression.cxx cppExpressionParser.cxx
@ -34,19 +34,12 @@ set(P3CPPPARSER_SOURCE_FILES
cppTypeParser.cxx cppTypeProxy.cxx cppTypedef.cxx
cppUsing.cxx cppVisibility.cxx)
foreach(FILENAME IN LISTS P3CPPPARSER_HEADER_FILES)
set(P3CPPPARSER_HEADERS ${P3CPPPARSER_HEADERS} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
foreach(FILENAME IN LISTS P3CPPPARSER_SOURCE_FILES)
set(P3CPPPARSER_SOURCES ${P3CPPPARSER_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
if(HAVE_INTERROGATE)
find_package(BISON)
bison_target(cppParser
${CMAKE_CURRENT_LIST_DIR}/cppBison.yxx
${CMAKE_CURRENT_LIST_DIR}/cppBison.cxx
COMPILE_FLAGS --defines=${CMAKE_CURRENT_LIST_DIR}/cppBison.h)
cppBison.yxx
cppBison.cxx
COMPILE_FLAGS --defines=cppBison.h)
add_library(p3cppParser STATIC
${P3CPPPARSER_HEADERS}

17
dtool/src/dconfig/CMakeLists.txt
View File

@ -1,20 +1,13 @@
include_directories(${CMAKE_CURRENT_LIST_DIR}/../dtoolutil)
include_directories(${CMAKE_CURRENT_LIST_DIR}/../dtoolbase)
include_directories(${CMAKE_CURRENT_LIST_DIR}/../prc)
include_directories(../dtoolutil)
include_directories(../dtoolbase)
include_directories(../prc)
set(P3DCONFIG_HEADER_FILES
set(P3DCONFIG_HEADERS
config_dconfig.h dconfig.I dconfig.h)
set(P3DCONFIG_SOURCE_FILES
set(P3DCONFIG_SOURCES
config_dconfig.cxx dconfig.cxx)
foreach(FILENAME IN LISTS P3DCONFIG_HEADER_FILES)
set(P3DCONFIG_HEADERS ${P3DCONFIG_HEADERS} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
foreach(FILENAME IN LISTS P3DCONFIG_SOURCE_FILES)
set(P3DCONFIG_SOURCES ${P3DCONFIG_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
add_library(p3dconfig STATIC
${P3DCONFIG_HEADERS}
${P3DCONFIG_SOURCES})

13
dtool/src/dtoolbase/CMakeLists.txt
View File

@ -1,4 +1,4 @@
set(P3DTOOLBASE_HEADER_FILES
set(P3DTOOLBASE_HEADERS
addHash.I addHash.h
atomicAdjust.h
atomicAdjustDummyImpl.h atomicAdjustDummyImpl.I
@ -35,7 +35,7 @@ set(P3DTOOLBASE_HEADER_FILES
lookup3.h
)
set(P3DTOOLBASE_SOURCE_FILES
set(P3DTOOLBASE_SOURCES
addHash.cxx
atomicAdjustDummyImpl.cxx
atomicAdjustI386Impl.cxx
@ -59,14 +59,7 @@ set(P3DTOOLBASE_SOURCE_FILES
typedObject.cxx
)
foreach(FILENAME IN LISTS P3DTOOLBASE_HEADER_FILES)
set(P3DTOOLBASE_INSTALL_HEADERS ${P3DTOOLBASE_INSTALL_HEADERS} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
foreach(FILENAME IN LISTS P3DTOOLBASE_SOURCE_FILES)
set(P3DTOOLBASE_SOURCES ${P3DTOOLBASE_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
add_library(p3dtoolbase STATIC
${P3DTOOLBASE_INSTALL_HEADERS}
${P3DTOOLBASE_HEADERS}
${P3DTOOLBASE_SOURCES}
)

35
dtool/src/dtoolutil/CMakeLists.txt
View File

@ -1,16 +1,18 @@
include_directories(${CMAKE_CURRENT_LIST_DIR}/../dtoolbase)
include_directories(../dtoolbase)
configure_file(${CMAKE_CURRENT_LIST_DIR}/pandaVersion.h.cmake
${CMAKE_CURRENT_LIST_DIR}/pandaVersion.h)
configure_file(pandaVersion.h.cmake
pandaVersion.h)
configure_file(${CMAKE_CURRENT_LIST_DIR}/checkPandaVersion.h.cmake
${CMAKE_CURRENT_LIST_DIR}/checkPandaVersion.h)
configure_file(checkPandaVersion.h.cmake
checkPandaVersion.h)
configure_file(${CMAKE_CURRENT_LIST_DIR}/checkPandaVersion.cxx.cmake
${CMAKE_CURRENT_LIST_DIR}/checkPandaVersion.cxx)
configure_file(checkPandaVersion.cxx.cmake
checkPandaVersion.cxx)
set(P3DTOOLUTIL_HEADER_FILES
checkPandaVersion.h
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(P3DTOOLUTIL_HEADERS
${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.h
config_dtoolutil.h
dSearchPath.I dSearchPath.h
executionEnvironment.I executionEnvironment.h filename.I
@ -32,12 +34,12 @@ set(P3DTOOLUTIL_HEADER_FILES
)
if(APPLE)
set(P3DTOOL_HEADER_FILES ${P3DTOOL_HEADER_FILES}
set(P3DTOOLUTIL_HEADERS ${P3DTOOLUTIL_HEADERS}
filename_assist.mm filename_assist.h)
endif()
set(P3DTOOLUTIL_SOURCE_FILES
checkPandaVersion.cxx
set(P3DTOOLUTIL_SOURCES
${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.cxx
config_dtoolutil.cxx
dSearchPath.cxx
executionEnvironment.cxx filename.cxx
@ -55,14 +57,7 @@ set(P3DTOOLUTIL_SOURCE_FILES
win32ArgParser.cxx
)
foreach(FILENAME IN LISTS P3DTOOLUTIL_HEADER_FILES)
set(P3DTOOLUTIL_INSTALL_HEADERS ${P3DTOOLUTIL_INSTALL_HEADERS} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
foreach(FILENAME IN LISTS P3DTOOLUTIL_SOURCE_FILES)
set(P3DTOOLUTIL_SOURCES ${P3DTOOLUTIL_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
add_library(p3dtoolutil STATIC
${P3DTOOLUTIL_INSTALL_HEADERS}
${P3DTOOLUTIL_HEADERS}
${P3DTOOLUTIL_SOURCES}
)

22
dtool/src/prc/CMakeLists.txt
View File

@ -1,13 +1,14 @@
include_directories(${CMAKE_CURRENT_LIST_DIR}/../dtoolutil)
include_directories(${CMAKE_CURRENT_LIST_DIR}/../dtoolbase)
include_directories(../dtoolutil)
include_directories(../dtoolbase)
set(PRC_DCONFIG_TRUST_LEVEL 0 CACHE STRING "The trust level value for any legacy (DConfig) variables.")
set(PRC_INC_TRUST_LEVEL 0 CACHE STRING "The amount by which we globally increment the trust level.")
configure_file(${CMAKE_CURRENT_LIST_DIR}/prc_parameters.h.cmake
${CMAKE_CURRENT_LIST_DIR}/prc_parameters.h)
configure_file(prc_parameters.h.cmake
prc_parameters.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(P3PRC_HEADER_FILES
set(P3PRC_HEADERS
bigEndian.h
config_prc.h
configDeclaration.I configDeclaration.h
@ -39,9 +40,9 @@ set(P3PRC_HEADER_FILES
streamReader.I streamReader.h
streamWrapper.I streamWrapper.h
streamWriter.I streamWriter.h
prc_parameters.h)
${CMAKE_CURRENT_BINARY_DIR}/prc_parameters.h)
set(P3PRC_SOURCE_FILES
set(P3PRC_SOURCES
config_prc.cxx
configDeclaration.cxx
configFlags.cxx
@ -69,13 +70,6 @@ set(P3PRC_SOURCE_FILES
reversedNumericData.cxx
streamReader.cxx streamWrapper.cxx streamWriter.cxx)
foreach(FILENAME IN LISTS P3PRC_HEADER_FILES)
set(P3PRC_HEADERS ${P3PRC_HEADERS} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
foreach(FILENAME IN LISTS P3PRC_SOURCE_FILES)
set(P3PRC_SOURCES ${P3PRC_SOURCES} ${CMAKE_CURRENT_LIST_DIR}/${FILENAME})
endforeach()
add_library(p3prc STATIC
${P3PRC_HEADERS}
${P3PRC_SOURCES})