Added more Framework install targets.

Bindings/Contents/CMakeLists.txt

@@ -19,7 +19,21 @@ IF(POLYCODE_BUILD_SHARED)
 ENDIF(POLYCODE_BUILD_SHARED)
 
 IF(POLYCODE_BUILD_STATIC)
-    LINK_LIBRARIES(PolyCore_static)
     ADD_LIBRARY(PolycodeLua_static ${polycodeLua_SRCS} ${polycodeLua_HDRS})
+    TARGET_LINK_LIBRARIES(PolycodeLua_static PolyCore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 
+IF(POLYCODE_INSTALL_FRAMEWORK)
+    
+    # install headers
+    INSTALL(FILES ${polycodeLua_HDRS} DESTINATION Framework/Modules/Include)
+
+    # install libraries
+    IF(POLYCODE_BUILD_SHARED)
+        INSTALL(TARGETS PolycodeLua DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+    ENDIF(POLYCODE_BUILD_SHARED)
+    IF(POLYCODE_BUILD_STATIC)
+        INSTALL(TARGETS PolycodeLua_static DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+    ENDIF(POLYCODE_BUILD_STATIC)
+    
+ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Core/Contents/CMakeLists.txt

@@ -224,13 +224,14 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     # install libraries
     IF(POLYCODE_BUILD_SHARED)
         INSTALL(TARGETS PolyCore EXPORT PolyCore-targets DESTINATION Framework/Core/Lib/${CMAKE_BUILD_TYPE})
-    ENDIF()
+    ENDIF(POLYCODE_BUILD_SHARED)
+    
     IF(POLYCODE_BUILD_STATIC)
         INSTALL(TARGETS PolyCore_static EXPORT PolyCore-targets DESTINATION Framework/Core/Lib/${CMAKE_BUILD_TYPE})
-    ENDIF()
+    ENDIF(POLYCODE_BUILD_STATIC)
 
     # from Box2D's cmake file - not sure what it does yet
     # install build system hooks for third-party apps
     # INSTALL(EXPORT PolyCore-targets DESTINATION Lib/Box2D)
     # INSTALL(FILES Box2DConfig.cmake DESTINATION Lib/Box2D)
-ENDIF(POLYCODE_INSTALL_FRAMEWORK)
+ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Modules/Contents/2DPhysics/CMakeLists.txt

@@ -15,13 +15,27 @@ INCLUDE_DIRECTORIES(
 )
 
 IF(POLYCODE_BUILD_SHARED)
-LINK_LIBRARIES(${BOX2D_LIBRARIES})
-ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode2DPhysics PolyCore)
+    LINK_LIBRARIES(${BOX2D_LIBRARIES})
+    ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+    TARGET_LINK_LIBRARIES(Polycode2DPhysics PolyCore)
 ENDIF(POLYCODE_BUILD_SHARED)
 
 IF(POLYCODE_BUILD_STATIC)
-ADD_LIBRARY(Polycode2DPhysics_static ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode2DPhysics_static PolyCore_static)
+    ADD_LIBRARY(Polycode2DPhysics_static ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+    TARGET_LINK_LIBRARIES(Polycode2DPhysics_static PolyCore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
 
+IF(POLYCODE_INSTALL_FRAMEWORK)
+    
+    # install headers
+    INSTALL(FILES ${polycode2DPhysics_HDRS} DESTINATION Framework/Modules/Include)
+
+    # install libraries
+    IF(POLYCODE_BUILD_SHARED)
+        INSTALL(TARGETS Polycode2DPhysics DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+    ENDIF(POLYCODE_BUILD_SHARED)
+    IF(POLYCODE_BUILD_STATIC)
+        INSTALL(TARGETS Polycode2DPhysics_static DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+    ENDIF(POLYCODE_BUILD_STATIC)
+    
+ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Modules/Contents/3DPhysics/CMakeLists.txt

@@ -18,16 +18,26 @@ INCLUDE_DIRECTORIES(
     Include
 )
 
-#ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
-ADD_LIBRARY(Polycode3DPhysicsStatic ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
-
 IF(POLYCODE_BUILD_SHARED)
-LINK_LIBRARIES(${BULLET_LIBRARIES})
-ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode3DPhysics PolyCore)
+	LINK_LIBRARIES(${BULLET_LIBRARIES})
+	ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+	TARGET_LINK_LIBRARIES(Polycode3DPhysics PolyCore)
 ENDIF(POLYCODE_BUILD_SHARED)
 
 IF(POLYCODE_BUILD_STATIC)
-ADD_LIBRARY(Polycode3DPhysics_static ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
-TARGET_LINK_LIBRARIES(Polycode3DPhysics_static PolyCore_static)
+	ADD_LIBRARY(Polycode3DPhysics_static ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+	TARGET_LINK_LIBRARIES(Polycode3DPhysics_static PolyCore_static)
 ENDIF(POLYCODE_BUILD_STATIC)
+
+IF(POLYCODE_INSTALL_FRAMEWORK)
+    # install headers
+    INSTALL(FILES ${polycode3DPhysics_HDRS} DESTINATION Framework/Modules/Include)
+
+    # install libraries
+    IF(POLYCODE_BUILD_SHARED)
+        INSTALL(TARGETS Polycode3DPhysics DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+    ENDIF()
+    IF(POLYCODE_BUILD_STATIC)
+        INSTALL(TARGETS Polycode3DPhysics_static DESTINATION Framework/Modules/Lib/${CMAKE_BUILD_TYPE})
+    ENDIF()
+ENDIF(POLYCODE_INSTALL_FRAMEWORK)

Tools/Contents/polyimport/CMakeLists.txt

@@ -9,3 +9,16 @@ IF(POLYCODE_BUILD_STATIC)
     ADD_EXECUTABLE(polyimport_static Source/polyimport.cpp Include/polyimport.h)
     TARGET_LINK_LIBRARIES(polyimport_static PolyCore_static ${PHYSFS_LIBRARY} ${ASSIMP_LIBRARY_RELEASE})
 ENDIF(POLYCODE_BUILD_STATIC)
+
+IF(POLYCODE_INSTALL_FRAMEWORK)
+
+    # install exes
+    IF(POLYCODE_BUILD_SHARED)
+        INSTALL(TARGETS polyimport DESTINATION Framework/Tools)
+    ENDIF(POLYCODE_BUILD_SHARED)
+    
+    IF(POLYCODE_BUILD_STATIC)
+        INSTALL(TARGETS polyimport_static DESTINATION Framework/Tools)
+    ENDIF(POLYCODE_BUILD_STATIC)
+
+ENDIF(POLYCODE_INSTALL_FRAMEWORK)