CMake: Update CMakeLists for recent upstream changes.

This commit is contained in:
Sam Edwards 2015-03-28 11:16:19 -07:00
parent 69c22868e1
commit a0f704b67a
4 changed files with 52 additions and 42 deletions

View File

@ -14,7 +14,7 @@ set(P3CPPPARSER_HEADERS
cppSimpleType.h cppStructType.h cppTBDType.h
cppTemplateParameterList.h cppTemplateScope.h cppToken.h
cppType.h cppTypeDeclaration.h cppTypeParser.h
cppTypeProxy.h cppTypedef.h cppUsing.h cppVisibility.h
cppTypeProxy.h cppTypedefType.h cppUsing.h cppVisibility.h
)
set(P3CPPPARSER_SOURCES
@ -32,7 +32,7 @@ set(P3CPPPARSER_SOURCES
cppStructType.cxx cppTBDType.cxx
cppTemplateParameterList.cxx cppTemplateScope.cxx
cppToken.cxx cppType.cxx cppTypeDeclaration.cxx
cppTypeParser.cxx cppTypeProxy.cxx cppTypedef.cxx
cppTypeParser.cxx cppTypeProxy.cxx cppTypedefType.cxx
cppUsing.cxx cppVisibility.cxx
)

View File

@ -3,51 +3,54 @@ configure_file(checkPandaVersion.h.in checkPandaVersion.h)
configure_file(checkPandaVersion.cxx.in checkPandaVersion.cxx)
set(P3DTOOLUTIL_HEADERS
${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.h
config_dtoolutil.h
dSearchPath.I dSearchPath.h
executionEnvironment.I executionEnvironment.h filename.I
filename.h
globPattern.I globPattern.h
load_dso.h
pandaFileStream.h pandaFileStream.I
pandaFileStreamBuf.h
pandaSystem.h pandaVersion.h
panda_getopt.h panda_getopt_long.h panda_getopt_impl.h
pfstream.h pfstream.I pfstreamBuf.h
preprocess_argv.h
${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.h
config_dtoolutil.h
dSearchPath.I dSearchPath.h
executionEnvironment.I executionEnvironment.h filename.I
filename.h
globPattern.I globPattern.h
lineStream.I lineStream.h
lineStreamBuf.I lineStreamBuf.h
load_dso.h
pandaFileStream.h pandaFileStream.I
pandaFileStreamBuf.h
pandaSystem.h pandaVersion.h
panda_getopt.h panda_getopt_long.h panda_getopt_impl.h
pfstream.h pfstream.I pfstreamBuf.h
preprocess_argv.h
string_utils.h string_utils.I
stringDecoder.h stringDecoder.I
textEncoder.h textEncoder.I
unicodeLatinMap.h
vector_string.h
vector_src.h
win32ArgParser.h
stringDecoder.h stringDecoder.I
textEncoder.h textEncoder.I
unicodeLatinMap.h
vector_string.h
vector_src.h
win32ArgParser.h
)
if(APPLE)
set(P3DTOOLUTIL_HEADERS ${P3DTOOLUTIL_HEADERS}
filename_assist.mm filename_assist.h)
set(P3DTOOLUTIL_HEADERS ${P3DTOOLUTIL_HEADERS}
filename_assist.mm filename_assist.h)
endif()
set(P3DTOOLUTIL_SOURCES
${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.cxx
config_dtoolutil.cxx
dSearchPath.cxx
executionEnvironment.cxx filename.cxx
globPattern.cxx
load_dso.cxx
pandaFileStream.cxx pandaFileStreamBuf.cxx
pandaSystem.cxx
panda_getopt_impl.cxx
pfstreamBuf.cxx pfstream.cxx
preprocess_argv.cxx
${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.cxx
config_dtoolutil.cxx
dSearchPath.cxx
executionEnvironment.cxx filename.cxx
globPattern.cxx
lineStream.cxx lineStreamBuf.cxx
load_dso.cxx
pandaFileStream.cxx pandaFileStreamBuf.cxx
pandaSystem.cxx
panda_getopt_impl.cxx
pfstreamBuf.cxx pfstream.cxx
preprocess_argv.cxx
string_utils.cxx
stringDecoder.cxx
textEncoder.cxx
unicodeLatinMap.cxx
vector_string.cxx
win32ArgParser.cxx
stringDecoder.cxx
textEncoder.cxx
unicodeLatinMap.cxx
vector_string.cxx
win32ArgParser.cxx
)
composite_sources(p3dtoolutil P3DTOOLUTIL_SOURCES)

View File

@ -123,6 +123,10 @@ set(P3EXPRESS_SOURCES
zStream.cxx zStreamBuf.cxx)
set(P3EXPRESS_IGATEEXT
filename_ext.cxx
filename_ext.h
globPattern_ext.cxx
globPattern_ext.h
memoryUsagePointers_ext.cxx
memoryUsagePointers_ext.h
pointerToArray_ext.h
@ -130,6 +134,8 @@ set(P3EXPRESS_IGATEEXT
ramfile_ext.h
streamReader_ext.cxx
streamReader_ext.h
typeHandle_ext.cxx
typeHandle_ext.h
virtualFileSystem_ext.cxx
virtualFileSystem_ext.h)

View File

@ -19,6 +19,7 @@ set(P3PUTIL_HEADERS
callbackObject.h callbackObject.I
clockObject.h clockObject.I
collideMask.h
colorSpace.h
copyOnWriteObject.h copyOnWriteObject.I
copyOnWritePointer.h copyOnWritePointer.I
compareTo.I compareTo.h
@ -39,8 +40,7 @@ set(P3PUTIL_HEADERS
indirectCompareSort.I indirectCompareSort.h
indirectCompareTo.I indirectCompareTo.h
ioPtaDatagramFloat.h ioPtaDatagramInt.h
ioPtaDatagramShort.h keyboardButton.h lineStream.I
lineStream.h lineStreamBuf.I lineStreamBuf.h
ioPtaDatagramShort.h keyboardButton.h
linkedListNode.I linkedListNode.h
load_prc_file.h
loaderOptions.I loaderOptions.h
@ -79,6 +79,7 @@ set(P3PUTIL_SOURCES
callbackData.cxx
callbackObject.cxx
clockObject.cxx
colorSpace.cxx
copyOnWriteObject.cxx
copyOnWritePointer.cxx
config_util.cxx configurable.cxx
@ -90,7 +91,7 @@ set(P3PUTIL_SOURCES
globalPointerRegistry.cxx
ioPtaDatagramFloat.cxx
ioPtaDatagramInt.cxx ioPtaDatagramShort.cxx
keyboardButton.cxx lineStream.cxx lineStreamBuf.cxx
keyboardButton.cxx
linkedListNode.cxx
load_prc_file.cxx
loaderOptions.cxx