Преглед изворни кода

Merge branch 'cmake-exports' into pxljm

Cameron Hart пре 14 година
родитељ
комит
3bd14d1d20
2 измењених фајлова са 17 додато и 9 уклоњено
  1. 12 8
      Core/Contents/CMakeLists.txt
  2. 5 1
      Modules/Contents/2DPhysics/CMakeLists.txt

+ 12 - 8
Core/Contents/CMakeLists.txt

@@ -229,15 +229,19 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/include)
 
     # install libraries
-#    IF(POLYCODE_BUILD_SHARED)
-#        INSTALL(TARGETS Polycore_dynamic EXPORT Polycore-targets 
-#            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
-#    ENDIF(POLYCODE_BUILD_SHARED)
+#   IF(POLYCODE_BUILD_SHARED)
+#       INSTALL(TARGETS Polycore_dynamic EXPORT Polycore-targets
+#           DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
+#   ENDIF(POLYCODE_BUILD_SHARED)
     
-#    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS Polycore EXPORT Polycore-targets 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
-#    ENDIF(POLYCODE_BUILD_STATIC)
+#   IF(POLYCODE_BUILD_STATIC)
+	INSTALL(TARGETS Polycore EXPORT Polycore-targets
+		DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
+#   ENDIF(POLYCODE_BUILD_STATIC)
+
+	INSTALL(EXPORT Polycore-targets DESTINATION
+		${POLYCODE_RELEASE_DIR}/Framework/Core/lib/Polycore)
+
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 
 IF(POLYCODE_INSTALL_PLAYER)

+ 5 - 1
Modules/Contents/2DPhysics/CMakeLists.txt

@@ -45,10 +45,14 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
 
     # install libraries
 #    IF(POLYCODE_BUILD_SHARED)
-    INSTALL(TARGETS Polycode2DPhysics DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+	INSTALL(TARGETS Polycode2DPhysics EXPORT Polycode2DPhysics-targets
+		DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
 #    ENDIF(POLYCODE_BUILD_SHARED)
 #    IF(POLYCODE_BUILD_STATIC)
 #        INSTALL(TARGETS Polycode2DPhysics_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
 #    ENDIF(POLYCODE_BUILD_STATIC)
+
+	INSTALL(EXPORT Polycode2DPhysics-targets DESTINATION
+		${POLYCODE_RELEASE_DIR}/Framework/Modules/lib/Polycode2DPhysics)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)