hasufell    14/07/20 17:39:20

  Added:                libRocket-1.3.0.0-build.patch
  Log:
  version bump, add SUBSLOT (SONAME)
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
BDEED020)

Revision  Changes    Path
1.1                  dev-libs/libRocket/files/libRocket-1.3.0.0-build.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/files/libRocket-1.3.0.0-build.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libRocket/files/libRocket-1.3.0.0-build.patch?rev=1.1&content-type=text/plain

Index: libRocket-1.3.0.0-build.patch
===================================================================
From: Julian Ospald <[email protected]>
--- Build/CMakeLists.txt
+++ Build/CMakeLists.txt
@@ -11,6 +11,9 @@
 
 project(libRocket C CXX)
 
+# paths
+include(GNUInstallDirs)
+
 set(LIBROCKET_VERSION_MAJOR 1)
 set(LIBROCKET_VERSION_MINOR 2)
 set(LIBROCKET_VERSION_PATCH 1)
@@ -131,8 +134,8 @@
     endif()
 
     install(TARGETS ${NAME}
-            LIBRARY DESTINATION lib
-            ARCHIVE DESTINATION lib
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
 endforeach(library)
 
@@ -237,7 +240,7 @@
         endif()
     endif()
    
-    set(SAMPLES_DIR opt/Rocket/Samples)
+    set(SAMPLES_DIR opt/Rocket/Samples CACHE PATH "path to samples dir")
 
     # The samples use the shell library
     include_directories(${PROJECT_SOURCE_DIR}/Samples/shell/include)
@@ -256,8 +259,8 @@
     target_link_libraries(${sample_LIBRARIES})
 
     install(TARGETS shell
-            LIBRARY DESTINATION lib
-            ARCHIVE DESTINATION lib
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
 
     list(APPEND samples treeview customlog drag loaddocument)




Reply via email to