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

thanks to eitttje, see Issue 548

src/MiniCL/CMakeLists.txt

@@ -5,17 +5,30 @@ INCLUDE_DIRECTORIES(
 	${VECTOR_MATH_INCLUDE}
 )
 
-ADD_LIBRARY(MiniCL
-		MiniCL.cpp
-		MiniCLTaskScheduler.cpp
-		MiniCLTaskScheduler.h
-		MiniCLTask/MiniCLTask.cpp
-		MiniCLTask/MiniCLTask.h
-		../MiniCL/cl.h
-		../MiniCL/cl_gl.h
-		../MiniCL/cl_platform.h
-		../MiniCL/cl_MiniCL_Defs.h
+SET(MiniCL_SRCS
+	MiniCL.cpp
+	MiniCLTaskScheduler.cpp
+	MiniCLTask/MiniCLTask.cpp
 )
+
+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)