Просмотр исходного кода

Plugins/Data/CMakeLists.txt: set unix install path for Plugin_Data
QGearsMain: set unix install path for q-gears
CMakeLists.txt: Build a package that can install on ubuntu 14.04 (maybe only 14.04 atm)

sithlord48 11 лет назад
Родитель
Сommit
363e58668a
3 измененных файлов с 19 добавлено и 5 удалено
  1. 17 3
      CMakeLists.txt
  2. 1 1
      PlugIns/Data/CMakeLists.txt
  3. 1 1
      QGearsMain/CMakeLists.txt

+ 17 - 3
CMakeLists.txt

@@ -202,10 +202,14 @@ if(WIN32)
 else()
 	# On Linux generate DEB packages
 	SET(CPACK_GENERATOR "DEB")
+	install( FILES ${CMAKE_SOURCE_DIR}/q-gears.png DESTINATION ./share/pixmaps/ )
+	install( FILES ${CMAKE_SOURCE_DIR}/q-gears.desktop DESTINATION ./share/applications/ )
 endif()
+# include install required system libaries as shown in cpack demo install
+INCLUDE(InstallRequiredSystemLibraries)
 
 # Set generic CPack properties
-SET(CPACK_PACKAGE_NAME "qgears")
+SET(CPACK_PACKAGE_NAME "q-gears")
 SET(CPACK_PACKAGE_VERSION ${QGears_VERSION_MAJOR}.${QGears_VERSION_MINOR}.0)
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Free Final Fantasy VII Engine")
 
@@ -222,8 +226,18 @@ SET(CPACK_WIX_UPGRADE_GUID 8fbb893f-5622-4f6d-a7f6-c221f7be5d52)
 SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Chris Rizzitello <sithlord48@gmail.com>")
 
 # TODO: Detect if we're building x64 and change this to match
-SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libogre-1.9, libois,libboost-program-options,libboost-filesystem,libvorbis,libopenal,libboost-test,zlib1g")
+#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libogre-1.9, libois,libboost-program-options,libboost-filesystem,libvorbis,libopenal,libboost-test,zlib1g")
+if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
+		MESSAGE ("64 bit")
+		set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+		
+else()
+		MESSAGE ("32 bit")
+		set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
+endif()
+
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libogre-1.9.0, libois-1.3.0,libboost-program-options1.54.0,libboost-filesystem1.54.0,libvorbis0a,libvorbisfile3,libvorbisenc2,libopenal1,libboost-test1.54.0,zlib1g")
+
 SET(CPACK_DEBIAN_PACKAGE_SECTION games)
 SET(CPACK_DEBIAN_PACKAGE_PRIORITY extra)
 

+ 1 - 1
PlugIns/Data/CMakeLists.txt

@@ -94,6 +94,6 @@ if(NOT QGEARS_STATIC)
   set_target_properties(DataPlugin PROPERTIES
     COMPILE_DEFINITIONS QGEARS_DATAPLUGIN_EXPORTS
   )
-  install(TARGETS DataPlugin LIBRARY DESTINATION qgears
+  install(TARGETS DataPlugin LIBRARY DESTINATION share/q-gears/plugins/
   )
 endif()

+ 1 - 1
QGearsMain/CMakeLists.txt

@@ -356,4 +356,4 @@ set(LIBRARIES
 )
 target_link_libraries(q-gears ${LIBRARIES})
 
-install(TARGETS q-gears DESTINATION ./)
+install(TARGETS q-gears DESTINATION ./games)