hasufell 14/10/10 19:18:22
Added: openclonk-5.5.1-tinyxml-shared.patch
openclonk-5.5.1-paths.patch
Log:
version bump
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with
key BDEED020)
Revision Changes Path
1.1
games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/openclonk/files/openclonk-5.5.1-tinyxml-shared.patch?rev=1.1&content-type=text/plain
Index: openclonk-5.5.1-tinyxml-shared.patch
===================================================================
From: Julian Ospald <[email protected]>
Date: Thu Feb 6 19:58:45 UTC 2014
Subject: use shared tinyxml
--- a/CMakeLists.txt.old.new
+++ b/CMakeLists.txt
@@ -1292,7 +1292,6 @@
CHECK_INCLUDE_FILE_CXX(getopt.h HAVE_GETOPT_H)
# TinyXML
-add_subdirectory(thirdparty/tinyxml)
target_link_libraries(openclonk tinyxml)
if(WIN32)
--- a/src/lib/StdMeshLoaderXml.cpp
+++ b/src/lib/StdMeshLoaderXml.cpp
@@ -19,7 +19,7 @@
#include "C4Include.h"
#include "StdMesh.h"
#include "StdMeshLoader.h"
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
// Helper class to load things from an XML file with error checking
class StdMeshLoader::StdMeshXML
1.1 games-action/openclonk/files/openclonk-5.5.1-paths.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/openclonk/files/openclonk-5.5.1-paths.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/openclonk/files/openclonk-5.5.1-paths.patch?rev=1.1&content-type=text/plain
Index: openclonk-5.5.1-paths.patch
===================================================================
From: Julian Ospald <[email protected]>
Date: Thu Feb 6 19:58:45 UTC 2014
Subject: make paths modifiable
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,16 @@
set(${_var} "${_string}" PARENT_SCOPE)
endfunction()
+
+############################################################################
+# User selectable paths
+############################################################################
+set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination")
+set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install
destination")
+set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination")
+set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install
destination")
+
+
############################################################################
# User selectable options
############################################################################
@@ -1170,10 +1180,16 @@
# Assemble compiler flags
############################################################################
if(UNIX)
+ if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}")
+ set(ABSOLUTE_INSTALL_DATADIR
"${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}")
+ else()
+ set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}")
+ endif()
+
# Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached,
# and when the path is changed both the old and new definition appears
# in the list of flags.
-
add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"")
+
add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"")
endif()
if(OC_CXX_FLAGS)
list(REMOVE_DUPLICATES OC_CXX_FLAGS)
@@ -1474,20 +1490,20 @@
DEPENDS c4group
VERBATIM
)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION
share/games/openclonk)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION
"${INSTALL_DATADIR}/openclonk")
endif()
endforeach()
if (NOT APPLE)
add_custom_target(groups DEPENDS ${OC_C4GROUPS})
add_dependencies(data groups)
-
+
# Install new files
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION
share/applications)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION
"${INSTALL_DATAROOTDIR}/applications")
# Install binaries
- install(TARGETS openclonk DESTINATION games)
- install(TARGETS c4group DESTINATION bin)
+ install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
+ install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}")
else()
install(TARGETS openclonk
BUNDLE DESTINATION .
