Permalink
Browse files

move header installs into each libs cmake file and make the headers a…

…part of the source so generated project files will include.
  • Loading branch information...
1 parent 18b9bbd commit 46fb7820dcf2552dcbe1a6f88f1927ff88c5e235 @ideasman42 ideasman42 committed Oct 13, 2011
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -8,6 +8,30 @@ set(libBaseUtils_include_dirs
set(libBaseUtils_include_dirs ${libBaseUtils_include_dirs} PARENT_SCOPE) # adding include dirs to a parent scope
+set(INST_SRC
+ include/COLLADABUIDList.h
+ include/COLLADABUStableHeaders.h
+ include/COLLADABUNativeString.h
+ include/COLLADABUException.h
+ include/COLLADABU.h
+ include/COLLADABUhash_map.h
+ include/COLLADABUStringUtils.h
+ include/COLLADABUPrerequisites.h
+ include/COLLADABUPcreCompiledPattern.h
+ include/COLLADABUUtils.h
+ include/COLLADABUPlatform.h
+ include/COLLADABUURI.h
+ include/COLLADABUHashFunctions.h
+)
+set(INST_MATH_SRC
+ include/Math/COLLADABUMathUtils.h
+ include/Math/COLLADABUMathVector3.h
+ include/Math/COLLADABUMathMatrix3.h
+ include/Math/COLLADABUMathMatrix4.h
+ include/Math/COLLADABUMathQuaternion.h
+ include/Math/COLLADABUMathPrerequisites.h
+)
+
set(SRC
src/COLLADABUUtils.cpp
src/COLLADABUURI.cpp
@@ -23,9 +47,12 @@ set(SRC
src/Math/COLLADABUMathUtils.cpp
src/Math/COLLADABUMathQuaternion.cpp
src/Math/COLLADABUMathMatrix4.cpp
+
+ ${INST_SRC}
+ ${INST_MATH_SRC}
)
-set(libBaseUtils_libs
+set(TARGET_LIBS
UTF
${PCRE_LIBRARIES}
)
@@ -36,4 +63,13 @@ include_directories(
${PCRE_INCLUDE_DIR}
)
-opencollada_add_lib(${name} "${SRC}" "${libBaseUtils_libs}")
+opencollada_add_lib(${name} "${SRC}" "${TARGET_LIBS}")
+
+install(
+ FILES ${INST_SRC}
+ DESTINATION ${OPENCOLLADA_INST_INCLUDE}/COLLADABaseUtils
+)
+install(
+ FILES ${INST_MATH_SRC}
+ DESTINATION ${OPENCOLLADA_INST_INCLUDE}/COLLADABaseUtils/Math
+)
@@ -7,6 +7,122 @@ set(libFramework_include_dirs
set(libFramework_include_dirs ${libFramework_include_dirs} PARENT_SCOPE) # adding include dirs to a parent scope
+set(INST_SRC
+ include/COLLADAFW.h
+ include/COLLADAFWAnimatable.h
+ include/COLLADAFWAnimatableFloat.h
+ include/COLLADAFWAnimation.h
+ include/COLLADAFWAnimationCurve.h
+ include/COLLADAFWAnimationList.h
+ include/COLLADAFWAnnotate.h
+ include/COLLADAFWArray.h
+ include/COLLADAFWArrayPrimitiveType.h
+ include/COLLADAFWAxisInfo.h
+ include/COLLADAFWCamera.h
+ include/COLLADAFWCode.h
+ include/COLLADAFWColor.h
+ include/COLLADAFWColorOrTexture.h
+ include/COLLADAFWConstants.h
+ include/COLLADAFWController.h
+ include/COLLADAFWEdge.h
+ include/COLLADAFWEffect.h
+ include/COLLADAFWEffectCommon.h
+ include/COLLADAFWException.h
+ include/COLLADAFWFileInfo.h
+ include/COLLADAFWFloatOrDoubleArray.h
+ include/COLLADAFWFloatOrParam.h
+ include/COLLADAFWFormula.h
+ include/COLLADAFWFormulaNewParam.h
+ include/COLLADAFWFormulas.h
+ include/COLLADAFWGeometry.h
+ include/COLLADAFWHashFunctions.h
+ include/COLLADAFWILoader.h
+ include/COLLADAFWIWriter.h
+ include/COLLADAFWImage.h
+ include/COLLADAFWImageSource.h
+ include/COLLADAFWInclude.h
+ include/COLLADAFWIndexList.h
+ include/COLLADAFWInstanceBase.h
+ include/COLLADAFWInstanceBindingBase.h
+ include/COLLADAFWInstanceCamera.h
+ include/COLLADAFWInstanceController.h
+ include/COLLADAFWInstanceGeometry.h
+ include/COLLADAFWInstanceKinematicsScene.h
+ include/COLLADAFWInstanceLight.h
+ include/COLLADAFWInstanceNode.h
+ include/COLLADAFWInstanceSceneGraph.h
+ include/COLLADAFWInstanceVisualScene.h
+ include/COLLADAFWJoint.h
+ include/COLLADAFWJointPrimitive.h
+ include/COLLADAFWKinematicsController.h
+ include/COLLADAFWKinematicsModel.h
+ include/COLLADAFWKinematicsScene.h
+ include/COLLADAFWLibraryNodes.h
+ include/COLLADAFWLight.h
+ include/COLLADAFWLines.h
+ include/COLLADAFWLinestrips.h
+ include/COLLADAFWLoaderUtils.h
+ include/COLLADAFWLookat.h
+ include/COLLADAFWMaterial.h
+ include/COLLADAFWMaterialBinding.h
+ include/COLLADAFWMatrix.h
+ include/COLLADAFWMesh.h
+ include/COLLADAFWMeshPrimitive.h
+ include/COLLADAFWMeshPrimitiveWithFaceVertexCount.h
+ include/COLLADAFWMeshVertexData.h
+ include/COLLADAFWModifier.h
+ include/COLLADAFWMorphController.h
+ include/COLLADAFWMotionProfile.h
+ include/COLLADAFWNewParam.h
+ include/COLLADAFWNode.h
+ include/COLLADAFWObject.h
+ include/COLLADAFWParam.h
+ include/COLLADAFWPass.h
+ include/COLLADAFWPassClear.h
+ include/COLLADAFWPassOutput.h
+ include/COLLADAFWPassTarget.h
+ include/COLLADAFWPointerArray.h
+ include/COLLADAFWPolygons.h
+ include/COLLADAFWPrerequisites.h
+ include/COLLADAFWRenderDraw.h
+ include/COLLADAFWRenderState.h
+ include/COLLADAFWRenderStateStatic.h
+ include/COLLADAFWRoot.h
+ include/COLLADAFWRotate.h
+ include/COLLADAFWSampler.h
+ include/COLLADAFWScale.h
+ include/COLLADAFWScene.h
+ include/COLLADAFWSemantic.h
+ include/COLLADAFWSetParam.h
+ include/COLLADAFWShader.h
+ include/COLLADAFWShaderBlinn.h
+ include/COLLADAFWShaderConstantFX.h
+ include/COLLADAFWShaderElement.h
+ include/COLLADAFWShaderLambert.h
+ include/COLLADAFWShaderPhong.h
+ include/COLLADAFWShear.h
+ include/COLLADAFWSkew.h
+ include/COLLADAFWSkinController.h
+ include/COLLADAFWSkinControllerData.h
+ include/COLLADAFWStableHeaders.h
+ include/COLLADAFWTarget.h
+ include/COLLADAFWTargetableValue.h
+ include/COLLADAFWTechnique.h
+ include/COLLADAFWTexture.h
+ include/COLLADAFWTextureCoordinateBinding.h
+ include/COLLADAFWTransformation.h
+ include/COLLADAFWTranslate.h
+ include/COLLADAFWTriangles.h
+ include/COLLADAFWTrifans.h
+ include/COLLADAFWTristrips.h
+ include/COLLADAFWTypes.h
+ include/COLLADAFWUniqueId.h
+ include/COLLADAFWValidate.h
+ include/COLLADAFWValueType.h
+ include/COLLADAFWVisualScene.h
+)
+
+
set(SRC
src/COLLADAFWLight.cpp
src/COLLADAFWEffectCommon.cpp
@@ -46,9 +162,11 @@ set(SRC
src/COLLADAFWFileInfo.cpp
src/COLLADAFWSkinControllerData.cpp
src/COLLADAFWMesh.cpp
+
+ ${INST_SRC}
)
-set(libFramework_libs
+set(TARGET_LIBS
OpenCOLLADABaseUtils
MathMLSolver
)
@@ -57,6 +175,10 @@ include_directories(
${libFramework_include_dirs}
${libBaseUtils_include_dirs}
${libMathMLSolver_include_dirs}
+)
+opencollada_add_lib(${name} "${SRC}" "${TARGET_LIBS}")
+install(
+ FILES ${INST_SRC}
+ DESTINATION ${OPENCOLLADA_INST_INCLUDE}/COLLADAFramework
)
-opencollada_add_lib(${name} "${SRC}" "${libFramework_libs}")
@@ -9,6 +9,81 @@ set(libSaxFrameworkLoader_include_dirs
set(libSaxFrameworkLoader_include_dirs ${libSaxFrameworkLoader_include_dirs} PARENT_SCOPE) # adding include dirs to a parent scope
+set(INST_SRC
+ include/COLLADASaxFWLAccessor.h
+ include/COLLADASaxFWLArrayElement.h
+ include/COLLADASaxFWLAssetLoader.h
+ include/COLLADASaxFWLCOLLADACsymbol.h
+ include/COLLADASaxFWLDocumentProcessor.h
+ include/COLLADASaxFWLException.h
+ include/COLLADASaxFWLExtraDataElementHandler.h
+ include/COLLADASaxFWLExtraDataLoader.h
+ include/COLLADASaxFWLFileLoader.h
+ include/COLLADASaxFWLFilePartLoader.h
+ include/COLLADASaxFWLFormulasLinker.h
+ include/COLLADASaxFWLFormulasLoader.h
+ include/COLLADASaxFWLGeometryLoader.h
+ include/COLLADASaxFWLGeometryMaterialIdInfo.h
+ include/COLLADASaxFWLHelperLoaderBase.h
+ include/COLLADASaxFWLIError.h
+ include/COLLADASaxFWLIErrorHandler.h
+ include/COLLADASaxFWLIExtraDataCallbackHandler.h
+ include/COLLADASaxFWLIFilePartLoader.h
+ include/COLLADASaxFWLIParserImpl.h
+ include/COLLADASaxFWLIParserImpl14.h
+ include/COLLADASaxFWLIParserImpl15.h
+ include/COLLADASaxFWLInputShared.h
+ include/COLLADASaxFWLInputUnshared.h
+ include/COLLADASaxFWLInstanceArticulatedSystemLoader.h
+ include/COLLADASaxFWLInstanceKinematicsModelLoader.h
+ include/COLLADASaxFWLIntermediateTargetable.h
+ include/COLLADASaxFWLInterpolationTypeSource.h
+ include/COLLADASaxFWLJointsLoader.h
+ include/COLLADASaxFWLKinematicsIntermediateData.h
+ include/COLLADASaxFWLKinematicsSceneCreator.h
+ include/COLLADASaxFWLLibraryAnimationsLoader.h
+ include/COLLADASaxFWLLibraryArticulatedSystemsLoader.h
+ include/COLLADASaxFWLLibraryCamerasLoader.h
+ include/COLLADASaxFWLLibraryControllersLoader.h
+ include/COLLADASaxFWLLibraryEffectsLoader.h
+ include/COLLADASaxFWLLibraryFormulasLoader.h
+ include/COLLADASaxFWLLibraryImagesLoader.h
+ include/COLLADASaxFWLLibraryJointsLoader.h
+ include/COLLADASaxFWLLibraryKinematicsModelsLoader.h
+ include/COLLADASaxFWLLibraryKinematicsScenesLoader.h
+ include/COLLADASaxFWLLibraryLightsLoader.h
+ include/COLLADASaxFWLLibraryMaterialsLoader.h
+ include/COLLADASaxFWLLibraryNodesLoader.h
+ include/COLLADASaxFWLLoader.h
+ include/COLLADASaxFWLMeshLoader.h
+ include/COLLADASaxFWLMeshPrimitiveInputList.h
+ include/COLLADASaxFWLNodeLoader.h
+ include/COLLADASaxFWLPHElement.h
+ include/COLLADASaxFWLPolygons.h
+ include/COLLADASaxFWLPostProcessor.h
+ include/COLLADASaxFWLPrerequisites.h
+ include/COLLADASaxFWLPrimitiveBase.h
+ include/COLLADASaxFWLRootParser14.h
+ include/COLLADASaxFWLRootParser15.h
+ include/COLLADASaxFWLSaxFWLError.h
+ include/COLLADASaxFWLSaxParserError.h
+ include/COLLADASaxFWLSaxParserErrorHandler.h
+ include/COLLADASaxFWLSceneLoader.h
+ include/COLLADASaxFWLSidAddress.h
+ include/COLLADASaxFWLSidTreeNode.h
+ include/COLLADASaxFWLSource.h
+ include/COLLADASaxFWLSourceArrayLoader.h
+ include/COLLADASaxFWLStableHeaders.h
+ include/COLLADASaxFWLTechniqueCommon.h
+ include/COLLADASaxFWLTransformationLoader.h
+ include/COLLADASaxFWLTypes.h
+ include/COLLADASaxFWLUtils.h
+ include/COLLADASaxFWLVersionParser.h
+ include/COLLADASaxFWLVertices.h
+ include/COLLADASaxFWLVisualSceneLoader.h
+ include/COLLADASaxFWLXmlTypes.h
+)
+
set(SRC
src/COLLADASaxFWLLibraryArticulatedSystemsLoader.cpp
src/COLLADASaxFWLCOLLADACsymbol.cpp
@@ -117,9 +192,11 @@ set(SRC
src/generated15/COLLADASaxFWLLibraryCamerasLoader15.cpp
src/generated15/COLLADASaxFWLLibraryMaterialsLoader15.cpp
src/generated15/COLLADASaxFWLLibraryControllersLoader15.cpp
+
+ ${INST_SRC}
)
-set(libSaxFrameworkLoader_libs
+set(TARGET_LIBS
OpenCOLLADABaseUtils
GeneratedSaxParser
OpenCOLLADAFramework
@@ -129,21 +206,42 @@ set(libSaxFrameworkLoader_libs
if (USE_LIBXML)
list(APPEND libGeneratedSaxParser_include_dirs ${LIBXML2_INCLUDE_DIR})
- list(APPEND libGeneratedSaxParser_libs ${LIBXML2_LIBRARIES})
+ list(APPEND TARGET_LIBS ${LIBXML2_LIBRARIES})
endif ()
if (USE_EXPAT)
list(APPEND libGeneratedSaxParser_include_dirs ${LIBEXPAT_INCLUDE_DIR})
- list(APPEND libGeneratedSaxParser_libs ${LIBEXPAT_LIBRARIES})
+ list(APPEND TARGET_LIBS ${LIBEXPAT_LIBRARIES})
endif ()
include_directories(
- ${libSaxFrameworkLoader_include_dirs}
- ${libMathMLSolver_include_dirs}
- ${libBaseUtils_include_dirs}
- ${libFramework_include_dirs}
+ ${libSaxFrameworkLoader_include_dirs}
+ ${libMathMLSolver_include_dirs}
+ ${libBaseUtils_include_dirs}
+ ${libFramework_include_dirs}
${libGeneratedSaxParser_include_dirs}
${PCRE_INCLUDE_DIR}
)
-opencollada_add_lib(${name} "${SRC}" "${libSaxFrameworkLoader_libs}")
+opencollada_add_lib(${name} "${SRC}" "${TARGET_LIBS}")
+
+install(
+ FILES ${INST_SRC}
+ DESTINATION ${OPENCOLLADA_INST_INCLUDE}/COLLADASaxFrameworkLoader
+)
+
+# HRMF, these should be in INST_SRC really! - campbell
+install(
+ DIRECTORY
+ include/generated14
+ DESTINATION
+ ${OPENCOLLADA_INST_INCLUDE}/COLLADASaxFrameworkLoader
+ PATTERN ".svn" EXCLUDE
+)
+install(
+ DIRECTORY
+ include/generated15
+ DESTINATION
+ ${OPENCOLLADA_INST_INCLUDE}/COLLADASaxFrameworkLoader
+ PATTERN ".svn" EXCLUDE
+)
Oops, something went wrong.

0 comments on commit 46fb782

Please sign in to comment.