CMakeListst.txt maintenance/improvement: create frameworks for BulletMultiThreaded and MiniCL, also minor fix in BulletCollision

thanks to eitttje, see Issue 548

src/BulletCollision/CMakeLists.txt

@@ -266,7 +266,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletCollision)
 		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 			SET_TARGET_PROPERTIES(BulletCollision PROPERTIES FRAMEWORK true)
 		
-			SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER ${Root_HDRS})
+			SET_TARGET_PROPERTIES(BulletCollision PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
 			# Have to list out sub-directories manually:
 			SET_PROPERTY(SOURCE ${BroadphaseCollision_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadphaseCollision)
 			SET_PROPERTY(SOURCE ${CollisionDispatch_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/CollisionDispatch)

src/BulletMultiThreaded/CMakeLists.txt

@@ -3,68 +3,81 @@ INCLUDE_DIRECTORIES(
 	${VECTOR_MATH_INCLUDE}
 )
 
-ADD_LIBRARY(BulletMultiThreaded
+SET(BulletMultiThreaded_SRCS
-		PlatformDefinitions.h
+	SpuFakeDma.cpp
-		PpuAddressSpace.h
+	SpuLibspe2Support.cpp
-		SpuFakeDma.cpp
+	btThreadSupportInterface.cpp
-		SpuFakeDma.h
+	Win32ThreadSupport.cpp
-		SpuDoubleBuffer.h
+	PosixThreadSupport.cpp
-		SpuLibspe2Support.cpp
+	SequentialThreadSupport.cpp
-		SpuLibspe2Support.h
+	SpuSampleTaskProcess.cpp
-		btThreadSupportInterface.cpp
+	SpuCollisionObjectWrapper.cpp 
-		btThreadSupportInterface.h
+	SpuCollisionTaskProcess.cpp
-		
+	SpuGatheringCollisionDispatcher.cpp
-		Win32ThreadSupport.cpp
+	SpuContactManifoldCollisionAlgorithm.cpp
-		Win32ThreadSupport.h
+	btParallelConstraintSolver.cpp
-		PosixThreadSupport.cpp
+	
-		PosixThreadSupport.h
+	#SPURS_PEGatherScatterTask/SpuPEGatherScatterTask.cpp
-		SequentialThreadSupport.cpp
+	#SpuPEGatherScatterTaskProcess.cpp
-		SequentialThreadSupport.h
-		SpuSampleTaskProcess.h
-		SpuSampleTaskProcess.cpp
 
-		SpuCollisionObjectWrapper.cpp 
+	SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp
-		SpuCollisionObjectWrapper.h 
+	SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
-		SpuCollisionTaskProcess.h
+	SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp
-		SpuCollisionTaskProcess.cpp
+	SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
-		SpuGatheringCollisionDispatcher.h
+	SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
-		SpuGatheringCollisionDispatcher.cpp
-		SpuContactManifoldCollisionAlgorithm.cpp
-		SpuContactManifoldCollisionAlgorithm.h
-		
-		btParallelConstraintSolver.cpp
-		btParallelConstraintSolver.h
-		
-		SpuNarrowPhaseCollisionTask/Box.h
-		SpuNarrowPhaseCollisionTask/boxBoxDistance.cpp
-		SpuNarrowPhaseCollisionTask/boxBoxDistance.h
-#		SPURS_PEGatherScatterTask/SpuPEGatherScatterTask.cpp
-#		SPURS_PEGatherScatterTask/SpuPEGatherScatterTask.h
-#		SpuPEGatherScatterTaskProcess.cpp
-#		SpuPEGatherScatterTaskProcess.h
-		
-		SpuNarrowPhaseCollisionTask/SpuContactResult.cpp
-		SpuNarrowPhaseCollisionTask/SpuContactResult.h
-		SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.cpp
-		SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h
-		SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h
-		SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h
-		SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
-		SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h
-		SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
-		SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h
 
-
+	#Some GPU related stuff, mainly CUDA and perhaps OpenCL
-#Some GPU related stuff, mainly CUDA and perhaps OpenCL
+	btGpu3DGridBroadphase.cpp
-		btGpu3DGridBroadphase.cpp
-		btGpu3DGridBroadphase.h
-		btGpu3DGridBroadphaseSharedCode.h
-		btGpu3DGridBroadphaseSharedDefs.h
-		btGpu3DGridBroadphaseSharedTypes.h
-		btGpuDefines.h
-		btGpuUtilsSharedCode.h
-		btGpuUtilsSharedDefs.h
 )
+
+SET(Root_HDRS
+	PlatformDefinitions.h
+	PpuAddressSpace.h
+	SpuFakeDma.h
+	SpuDoubleBuffer.h
+	SpuLibspe2Support.h
+	btThreadSupportInterface.h
+	Win32ThreadSupport.h
+	PosixThreadSupport.h
+	SequentialThreadSupport.h
+	SpuSampleTaskProcess.h
+	SpuCollisionObjectWrapper.cpp 
+	SpuCollisionObjectWrapper.h 
+	SpuCollisionTaskProcess.h
+	SpuGatheringCollisionDispatcher.h
+	SpuContactManifoldCollisionAlgorithm.h
+	btParallelConstraintSolver.h
+
+	#SPURS_PEGatherScatterTask/SpuPEGatherScatterTask.h
+	#SpuPEGatherScatterTaskProcess.h
+
+	#Some GPU related stuff, mainly CUDA and perhaps OpenCL
+	btGpu3DGridBroadphase.h
+	btGpu3DGridBroadphaseSharedCode.h
+	btGpu3DGridBroadphaseSharedDefs.h
+	btGpu3DGridBroadphaseSharedTypes.h
+	btGpuDefines.h
+	btGpuUtilsSharedCode.h
+	btGpuUtilsSharedDefs.h
+)
+
+SET(SpuNarrowPhaseCollisionTask_HDRS
+	SpuNarrowPhaseCollisionTask/Box.h
+	SpuNarrowPhaseCollisionTask/boxBoxDistance.h
+	SpuNarrowPhaseCollisionTask/SpuContactResult.h
+	SpuNarrowPhaseCollisionTask/SpuMinkowskiPenetrationDepthSolver.h
+	SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h
+	SpuNarrowPhaseCollisionTask/SpuPreferredPenetrationDirections.h
+	SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h
+	SpuNarrowPhaseCollisionTask/SpuCollisionShapes.h
+)
+
+SET(BulletMultiThreaded_HDRS
+	${Root_HDRS}
+	${SpuNarrowPhaseCollisionTask_HDRS}
+)
+
+ADD_LIBRARY(BulletMultiThreaded ${BulletMultiThreaded_SRCS} ${BulletMultiThreaded_HDRS})
 SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES SOVERSION ${BULLET_VERSION})
 
@@ -89,13 +102,22 @@ IF (INSTALL_LIBS)
 				IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 					INSTALL(TARGETS BulletMultiThreaded DESTINATION .)
 				ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
-				INSTALL(TARGETS BulletMultiThreaded DESTINATION lib${LIB_SUFFIX})
+					INSTALL(TARGETS BulletMultiThreaded DESTINATION lib${LIB_SUFFIX})
 					INSTALL(DIRECTORY
 ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING
 PATTERN "*.h"  PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
 				ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 #			ENDIF (INSTALL_EXTRA_LIBS)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES FRAMEWORK true)
+		
+			SET_TARGET_PROPERTIES(BulletMultiThreaded PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
+			# Have to list out sub-directories manually:
+			SET_PROPERTY(SOURCE ${SpuNarrowPhaseCollisionTask_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/SpuNarrowPhaseCollisionTask)
+		
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_LIBS)
 

src/MiniCL/CMakeLists.txt

@@ -5,17 +5,30 @@ INCLUDE_DIRECTORIES(
 	${VECTOR_MATH_INCLUDE}
 )
 
-ADD_LIBRARY(MiniCL
+SET(MiniCL_SRCS
-		MiniCL.cpp
+	MiniCL.cpp
-		MiniCLTaskScheduler.cpp
+	MiniCLTaskScheduler.cpp
-		MiniCLTaskScheduler.h
+	MiniCLTask/MiniCLTask.cpp
-		MiniCLTask/MiniCLTask.cpp
-		MiniCLTask/MiniCLTask.h
-		../MiniCL/cl.h
-		../MiniCL/cl_gl.h
-		../MiniCL/cl_platform.h
-		../MiniCL/cl_MiniCL_Defs.h
 )
+
+SET(Root_HDRS
+	MiniCLTaskScheduler.h
+	cl.h
+	cl_gl.h
+	cl_platform.h
+	cl_MiniCL_Defs.h
+)
+
+SET(MiniCLTask_HDRS
+	MiniCLTask/MiniCLTask.h
+)
+
+SET(MiniCL_HDRS
+	${Root_HDRS}
+	${MiniCLTask_HDRS}
+)
+
+ADD_LIBRARY(MiniCL ${MiniCL_SRCS} ${MiniCL_HDRS} )
 SET_TARGET_PROPERTIES(MiniCL PROPERTIES VERSION ${BULLET_VERSION})
 SET_TARGET_PROPERTIES(MiniCL PROPERTIES SOVERSION ${BULLET_VERSION})
 
@@ -39,6 +52,15 @@ PATTERN "*.h"  PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE)
 				ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 #			ENDIF (INSTALL_EXTRA_LIBS)
 		ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
+
+		IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
+			SET_TARGET_PROPERTIES(MiniCL PROPERTIES FRAMEWORK true)
+		
+			SET_TARGET_PROPERTIES(MiniCL PROPERTIES PUBLIC_HEADER "${Root_HDRS}")
+			# Have to list out sub-directories manually:
+			SET_PROPERTY(SOURCE ${MiniCLTask_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/MiniCLTask)
+		
+		ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
 	ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
 ENDIF (INSTALL_LIBS)