Ivan Safrin 14 лет назад
Родитель
Сommit
0dcb042fda

+ 1 - 1
.gitignore

@@ -52,7 +52,7 @@
 Debug
 Release
 Documentation
-
+Build
 
 /Tools/Build/Linux/polybuild*
 /Tools/Build/Linux/polyimport*

+ 1 - 1
Assets/Default asset pack/CMakeLists.txt

@@ -3,6 +3,6 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     
     # install default.pak file
     INSTALL(FILES default.pak
-        DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/Assets)
+        DESTINATION Core/Assets)
     
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 11 - 0
CMakeLists.txt

@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 PROJECT(Polycode)
 
+
 IF(NOT CMAKE_BUILD_TYPE)
     SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
       "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
@@ -35,6 +36,9 @@ IF(NOT POLYCODE_RELEASE_DIR)
     MESSAGE("No POLYCODE_RELEASE_DIR specified, to ${POLYCODE_RELEASE_DIR}") 
 ENDIF(NOT POLYCODE_RELEASE_DIR)
 
+SET(CMAKE_INSTALL_PREFIX ${POLYCODE_RELEASE_DIR}/Framework/)
+
+
 # set default externals install location
 SET(CMAKE_PREFIX_PATH 
     ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies
@@ -67,4 +71,11 @@ IF(POLYCODE_BUILD_TOOLS)
     ADD_SUBDIRECTORY(Tools/Contents)
 ENDIF(POLYCODE_BUILD_TOOLS)
 
+SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "8")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
+SET(CPACK_GENERATOR "ZIP")
+
+INCLUDE(CPack)
+
 # Install assets and dependencies

+ 4 - 4
Core/Contents/CMakeLists.txt

@@ -226,7 +226,7 @@ ADD_LIBRARY(Polycore ${polycore_SRCS} ${polycore_HDRS})
 IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
     INSTALL(FILES ${polycore_HDRS} 
-        DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/include)
+        DESTINATION Core/include)
 
     # install libraries
 #    IF(POLYCODE_BUILD_SHARED)
@@ -236,7 +236,7 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
     
 #    IF(POLYCODE_BUILD_STATIC)
         INSTALL(TARGETS Polycore EXPORT Polycore-targets 
-            DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Core/lib)
+            DESTINATION Core/lib)
 #    ENDIF(POLYCODE_BUILD_STATIC)
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)
 
@@ -246,6 +246,6 @@ IF(POLYCODE_INSTALL_PLAYER)
 #        INSTALL(TARGETS Polycore_dynamic DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
 #    END(POLYCODE_BUILD_SHARED)
     
-    INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/bin/ 
-        DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+#    INSTALL(DIRECTORY ${POLYCODE_RELEASE_DIR}/Framework/Core/Dependencies/bin/ 
+ #       DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
 ENDIF(POLYCODE_INSTALL_PLAYER)

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

@@ -42,11 +42,11 @@ ENDIF(APPLE)
 IF(POLYCODE_INSTALL_FRAMEWORK)
     
     # install headers
-    INSTALL(FILES ${polycode2DPhysics_HDRS} DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
+    INSTALL(FILES ${polycode2DPhysics_HDRS} DESTINATION Modules/include)
 
     # install libraries
 #    IF(POLYCODE_BUILD_SHARED)
-    INSTALL(TARGETS Polycode2DPhysics DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+    INSTALL(TARGETS Polycode2DPhysics DESTINATION Modules/lib)
 #    ENDIF(POLYCODE_BUILD_SHARED)
 #    IF(POLYCODE_BUILD_STATIC)
 #        INSTALL(TARGETS Polycode2DPhysics_static DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)

+ 2 - 2
Modules/Contents/3DPhysics/CMakeLists.txt

@@ -46,12 +46,12 @@ ENDIF(APPLE)
 IF(POLYCODE_INSTALL_FRAMEWORK)
     # install headers
     INSTALL(FILES ${polycode3DPhysics_HDRS} 
-        DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/include)
+        DESTINATION Modules/include)
 
      # install libraries
 #    IF(POLYCODE_BUILD_SHARED)
      INSTALL(TARGETS Polycode3DPhysics 
-         DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Modules/lib)
+         DESTINATION Modules/lib)
 #    ENDIF()
 #    IF(POLYCODE_BUILD_STATIC)
 #        INSTALL(TARGETS Polycode3DPhysics_static 

+ 1 - 1
Player/Contents/CMakeLists.txt

@@ -98,6 +98,6 @@ IF(POLYCODE_INSTALL_PLAYER)
 #    ENDIF()
 #    IF(POLYCODE_BUILD_STATIC)
     INSTALL(TARGETS PolycodePlayer 
-        DESTINATION ${POLYCODE_RELEASE_DIR}/Player)
+        DESTINATION Player)
 #    ENDIF()
 ENDIF(POLYCODE_INSTALL_PLAYER)

+ 1 - 1
Tools/Contents/polybuild/CMakeLists.txt

@@ -31,7 +31,7 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
 #    ENDIF(POLYCODE_BUILD_SHARED)
     
 #    IF(POLYCODE_BUILD_STATIC)
-        INSTALL(TARGETS polybuild DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
+        INSTALL(TARGETS polybuild DESTINATION Tools)
 #    ENDIF(POLYCODE_BUILD_STATIC)
 
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)

+ 1 - 1
Tools/Contents/polyimport/CMakeLists.txt

@@ -25,7 +25,7 @@ IF(POLYCODE_INSTALL_FRAMEWORK)
 #    ENDIF(POLYCODE_BUILD_SHARED)
     
 #    IF(POLYCODE_BUILD_STATIC)
-    INSTALL(TARGETS polyimport DESTINATION ${POLYCODE_RELEASE_DIR}/Framework/Tools)
+    INSTALL(TARGETS polyimport DESTINATION Tools)
 #    ENDIF(POLYCODE_BUILD_STATIC)
 
 ENDIF(POLYCODE_INSTALL_FRAMEWORK)