[gentoo-commits] gentoo-x86 commit in games-puzzle/meandmyshadow/files: meandmyshadow-0.3-cmake.patch

[gentoo-commits] gentoo-x86 commit in games-puzzle/meandmyshadow/files: meandmyshadow-0.3-cmake.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    12/03/27 16:36:21

  Added:                meandmyshadow-0.3-cmake.patch
  Log:
  Initial commit; ebuild submission and patch from hasufell and barul (bug #408811)
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  games-puzzle/meandmyshadow/files/meandmyshadow-0.3-cmake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/meandmyshadow/files/meandmyshadow-0.3-cmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-puzzle/meandmyshadow/files/meandmyshadow-0.3-cmake.patch?rev=1.1&content-type=text/plain

Index: meandmyshadow-0.3-cmake.patch
===================================================================
Creator: hasufell <julian.ospald@googlemail.com>
Date: Tue Mar 27 18:07:46 CEST 2012

add Path options to build system
see https://bugs.gentoo.org/show_bug.cgi?id=408811

--- CMakeLists.txt
+++ CMakeLists.txt
@@ -85,12 +85,20 @@
     ${CRYPTO_LIBRARY}
 )
 
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION share/meandmyshadow/)
-install(TARGETS meandmyshadow RUNTIME DESTINATION bin)
+# Path options
+set(BINDIR "bin" CACHE STRING "Where to install binaries")
+set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share" CACHE STRING "Sets the root of data directories to a non-default location")
+set(ICONDIR "${DATAROOTDIR}/icons" CACHE STRING "Sets the icon directory for desktop entry to a non-default location.")
+set(DESKTOPDIR "${DATAROOTDIR}/applications" CACHE STRING "Sets the desktop file directory for desktop entry to a non-default location.")
+
+# install locations
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${DATAROOTDIR}/meandmyshadow/)
+install(TARGETS meandmyshadow RUNTIME DESTINATION ${BINDIR})
+
 if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") 
-	install(FILES meandmyshadow.desktop DESTINATION share/applications/)
-	install(FILES icons/16x16/meandmyshadow.png DESTINATION share/icons/hicolor/16x16/apps/)
-	install(FILES icons/32x32/meandmyshadow.png DESTINATION share/icons/hicolor/32x32/apps/)
-	install(FILES icons/48x48/meandmyshadow.png DESTINATION share/icons/hicolor/48x48/apps/)
-	install(FILES icons/64x64/meandmyshadow.png DESTINATION share/icons/hicolor/64x64/apps/)
+	install(FILES meandmyshadow.desktop DESTINATION ${DESKTOPDIR})
+	install(FILES icons/16x16/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/16x16/apps/)
+	install(FILES icons/32x32/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/32x32/apps/)
+	install(FILES icons/48x48/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/48x48/apps/)
+	install(FILES icons/64x64/meandmyshadow.png DESTINATION ${ICONDIR}/hicolor/64x64/apps/)
 endif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
--- src/config.h.in
+++ src/config.h.in
@@ -4,7 +4,7 @@
 #if defined(WIN32)
 //#define DATA_PATH
 #else
-#define DATA_PATH "@CMAKE_INSTALL_PREFIX@/share/meandmyshadow/data/"
+#define DATA_PATH "@DATAROOTDIR@/meandmyshadow/data/"
 #endif
 
 #endif

[gentoo-commits] gentoo-x86 commit in games-puzzle/meandmyshadow/files: meandmyshadow-0.3-cmake.patch

[Alfredo Tupone (tupone)]

tupone      12/10/24 08:47:55

  Removed:              meandmyshadow-0.3-cmake.patch
  Log:
  Removing old version
  
  (Portage version: 2.1.11.30/cvs/Linux i686, signed Manifest commit with key 0145142D)