diff options
Diffstat (limited to 'media-libs/glbinding/files')
3 files changed, 53 insertions, 19 deletions
diff --git a/media-libs/glbinding/files/glbinding-2.1.1-CMakeLists.patch b/media-libs/glbinding/files/glbinding-2.1.1-CMakeLists.patch deleted file mode 100644 index 8c4b50577..000000000 --- a/media-libs/glbinding/files/glbinding-2.1.1-CMakeLists.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -159,16 +159,8 @@ add_subdirectory(deploy) - # Deployment (global project files)
- #
-
--# Install version file
--install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
--
- # Install cmake find script for the project
- install(FILES ${META_PROJECT_NAME}-config.cmake DESTINATION ${INSTALL_ROOT} COMPONENT dev)
-
--# Install the project meta files
--install(FILES AUTHORS DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
--install(FILES LICENSE DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
--install(FILES README.md DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
--
- # Install runtime data
- install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA} COMPONENT examples_data)
diff --git a/media-libs/glbinding/files/glbinding-3.1.0_p1-CMakeLists.patch b/media-libs/glbinding/files/glbinding-3.1.0_p1-CMakeLists.patch new file mode 100644 index 000000000..7486939e7 --- /dev/null +++ b/media-libs/glbinding/files/glbinding-3.1.0_p1-CMakeLists.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45f9981..2c71349 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -143,8 +143,8 @@ if(UNIX AND SYSTEM_DIR_INSTALL) + set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/<project>
+ set(INSTALL_DATA "share/${project}") # /usr/[local]/share/<project>
+ set(INSTALL_BIN "bin") # /usr/[local]/bin
+- set(INSTALL_SHARED "lib") # /usr/[local]/lib
+- set(INSTALL_LIB "lib") # /usr/[local]/lib
++ set(INSTALL_SHARED "${CMAKE_INSTALL_LIBDIR}") # /usr/[local]/lib
++ set(INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") # /usr/[local]/lib
+ set(INSTALL_INCLUDE "include") # /usr/[local]/include
+ set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/<project>
+ set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications
+@@ -157,8 +157,8 @@ else() + set(INSTALL_EXAMPLES ".") # ./
+ set(INSTALL_DATA ".") # ./
+ set(INSTALL_BIN ".") # ./
+- set(INSTALL_SHARED "lib") # ./lib
+- set(INSTALL_LIB "lib") # ./lib
++ set(INSTALL_SHARED "${CMAKE_INSTALL_LIBDIR}") # ./lib
++ set(INSTALL_LIB "${CMAKE_INSTALL_LIBDIR}") # ./lib
+ set(INSTALL_INCLUDE "include") # ./include
+ set(INSTALL_DOC "doc") # ./doc
+ set(INSTALL_SHORTCUTS "misc") # ./misc
+@@ -210,3 +210,14 @@ install(FILES README.md DESTINATION ${INSTALL_ROOT} COMPONENT runtime) + if (TARGET cubescape OR TARGET cubescape-log OR TARGET cubescape-qt)
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION ${INSTALL_DATA} COMPONENT examples_data)
+ endif()
++ ++MESSAGE(STATUS "<<< Gentoo configuration >>> ++Build type ${CMAKE_BUILD_TYPE} ++Install path ${CMAKE_INSTALL_PREFIX} ++Compiler flags: ++C ${CMAKE_C_FLAGS} ++C++ ${CMAKE_CXX_FLAGS} ++Linker flags: ++Executable ${CMAKE_EXE_LINKER_FLAGS} ++Module ${CMAKE_MODULE_LINKER_FLAGS} ++Shared ${CMAKE_SHARED_LINKER_FLAGS}\n") diff --git a/media-libs/glbinding/files/glbinding-3.1.0_p1-source_CMakeLists.patch b/media-libs/glbinding/files/glbinding-3.1.0_p1-source_CMakeLists.patch new file mode 100644 index 000000000..88d11dc3a --- /dev/null +++ b/media-libs/glbinding/files/glbinding-3.1.0_p1-source_CMakeLists.patch @@ -0,0 +1,12 @@ +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 757217b..19da804 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -13,7 +13,6 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_N + + # 3rdParties + set(IDE_FOLDER "3rdparty") +-add_subdirectory("3rdparty/KHR") + + # Libraries + set(IDE_FOLDER "") |