summaryrefslogtreecommitdiffstats
path: root/libraries/assimp/assimp_x64.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/assimp/assimp_x64.patch')
-rw-r--r--libraries/assimp/assimp_x64.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/libraries/assimp/assimp_x64.patch b/libraries/assimp/assimp_x64.patch
index b2b7bff162..b59400adc8 100644
--- a/libraries/assimp/assimp_x64.patch
+++ b/libraries/assimp/assimp_x64.patch
@@ -1,19 +1,19 @@
---- assimp--3.0.1270-sdk/CMakeLists.original.txt 2014-03-23 08:22:28.393687604 +0200
-+++ assimp--3.0.1270-sdk/CMakeLists.txt 2014-03-23 08:23:05.041229447 +0200
-@@ -32,13 +32,13 @@
+--- assimp-3.1.1/CMakeLists.original.txt 2014-06-16 02:16:35.080910490 +0300
++++ assimp-3.1.1/CMakeLists.txt 2014-06-16 02:19:22.898812477 +0300
+@@ -64,13 +64,13 @@
# source tree. During an out-of-source build, however, do not litter this
# directory, since that is probably what the user wanted to avoid.
IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
-- SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
-- SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib )
-+ SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib64 )
-+ SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib64 )
- SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin )
+- SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib" )
+- SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib" )
++ SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib64" )
++ SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib64" )
+ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
# Cache these to allow the user to override them manually.
--SET( LIB_INSTALL_DIR "lib" CACHE PATH
-+SET( LIB_INSTALL_DIR "lib64" CACHE PATH
+-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE PATH
++SET( ASSIMP_LIB_INSTALL_DIR "lib64" CACHE PATH
"Path the built library files are installed to." )
- SET( INCLUDE_INSTALL_DIR "include" CACHE PATH
+ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE PATH
"Path the header files are installed to." )