File Shark-fix_lib64_usage.patch of Package Shark

Overview Repositories Revisions Requests Users Attributes Meta

File Shark-fix_lib64_usage.patch of Package Shark

--- Shark-3.1.3.orig/CMakeLists.txt	2018-07-19 11:55:35.897570945 +0200
+++ Shark-3.1.3/CMakeLists.txt	2018-07-19 15:01:58.167278901 +0200
@@ -26,13 +26,13 @@ if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
 endif()
 if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
 	if(UNIX)
-		set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${shark_BINARY_DIR}/lib")
+		set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${shark_BINARY_DIR}/lib${LIB_SUFFIX}")
 	else()
 		set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${shark_BINARY_DIR}/bin")
 	endif()
 endif()
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
-	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${shark_BINARY_DIR}/lib")
+	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${shark_BINARY_DIR}/lib${LIB_SUFFIX}")
 endif()
 mark_as_advanced( 
 	CMAKE_RUNTIME_OUTPUT_DIRECTORY
@@ -93,13 +93,13 @@ set( CPACK_DEBIAN_PACKAGE_MAINTAINER "Ch
 #####################################################################
 if( UNIX )
 	set( SHARK_INSTALL_INCLUDE_DIR include/ )
-	set( SHARK_INSTALL_LIB_DIR lib/ )
+	set( SHARK_INSTALL_LIB_DIR lib${LIB_SUFFIX}/ )
 	set( SHARK_INSTALL_CONTRIB_DIR share/shark/contrib/ )
 	set( SHARK_INSTALL_EXAMPLE_DIR share/shark/examples/ )
 	set( SHARK_INSTALL_DOC_DIR share/shark/doc/ )
 else()
 	set( SHARK_INSTALL_INCLUDE_DIR include/shark/ )
-	set( SHARK_INSTALL_LIB_DIR lib/ )
+	set( SHARK_INSTALL_LIB_DIR lib${LIB_SUFFIX}/ )
 	set( SHARK_INSTALL_CONTRIB_DIR contrib/ )
 	set( SHARK_INSTALL_EXAMPLE_DIR examples/ )
 	set( SHARK_INSTALL_DOC_DIR doc )
@@ -419,7 +419,7 @@ endif()
 ###################################################################
 #                       CPACK PACKAGING
 ###################################################################
-set(INSTALL_CMAKE_DIR lib/cmake/Shark/)
+set(INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/Shark/)
 
 # Add all targets to the build-tree export set
 export(TARGETS shark SharkVersion FILE "${shark_BINARY_DIR}/SharkTargets.cmake")
@@ -428,7 +428,7 @@ export(TARGETS shark SharkVersion FILE "
 set(SHARK_USE_FILE "${PROJECT_SOURCE_DIR}/UseShark.cmake")
 set(SHARK_TARGETS_FILE "${PROJECT_BINARY_DIR}/SharkTargets.cmake")
 set(SHARK_LIBRARIES ${LINK_LIBRARIES} shark)
-set(SHARK_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/lib")
+set(SHARK_LIBRARY_DIRS "${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX}")
 set(SHARK_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include" "${Boost_INCLUDE_DIR}" ${EXTRA_INCLUDE_DIRECTORIES})
 
 # Configure the files to be exported
@@ -452,7 +452,7 @@ set(SHARK_CONFIG_CODE "${SHARK_CONFIG_CO
 set(SHARK_USE_FILE "\${SHARK_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}UseShark.cmake")
 set(SHARK_TARGETS_FILE "\${SHARK_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}SharkTargets.cmake")
 set(SHARK_LIBRARIES ${LINK_LIBRARIES} shark)
-set(SHARK_LIBRARY_DIRS "\${SHARK_INSTALL_PREFIX}/lib")
+set(SHARK_LIBRARY_DIRS "\${SHARK_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
 set(SHARK_INCLUDE_DIRS "\${SHARK_INSTALL_PREFIX}/${SHARK_INSTALL_INCLUDE_DIR}" "${Boost_INCLUDE_DIR}" ${EXTRA_INCLUDE_DIRECTORIES})
 configure_file(SharkConfig.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/SharkConfig.cmake")
 
--- Shark-3.1.3.orig/src/CMakeLists.txt	2018-07-19 11:55:35.893570915 +0200
+++ Shark-3.1.3/src/CMakeLists.txt	2018-07-19 14:51:52.990760569 +0200
@@ -50,8 +50,8 @@ set_target_properties( shark PROPERTIES
 install(TARGETS shark
 	    EXPORT SharkTargets
 	    RUNTIME DESTINATION bin
-	    LIBRARY DESTINATION lib
-	    ARCHIVE DESTINATION lib)
+	    LIBRARY DESTINATION lib${LIB_SUFFIX}
+	    ARCHIVE DESTINATION lib${LIB_SUFFIX})
 	
 install(TARGETS SharkVersion
 	    RUNTIME DESTINATION bin)

Places

File Shark-fix_lib64_usage.patch of Package Shark

Places