/[gentoo-x86]/sci-physics/clhep/files/clhep-2.1.2.4-libdir.patch
Gentoo

Contents of /sci-physics/clhep/files/clhep-2.1.2.4-libdir.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Aug 7 18:05:12 2012 UTC (2 years, 1 month ago) by bicatali
Branch: MAIN
CVS Tags: HEAD
Version bump, fixed older version for automake-1.9, bug #428006

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

1 diff -Nur CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake CLHEP/cmake/Modules/ClhepBuildLibrary.cmake
2 --- CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake 2012-07-09 19:33:59.000000000 +0100
3 +++ CLHEP/cmake/Modules/ClhepBuildLibrary.cmake 2012-08-07 18:44:55.000000000 +0100
4 @@ -47,8 +47,8 @@
5 # Install the libraries
6 INSTALL (TARGETS ${package} ${package}S
7 RUNTIME DESTINATION bin
8 - LIBRARY DESTINATION lib
9 - ARCHIVE DESTINATION lib
10 + LIBRARY DESTINATION lib${LIB_SUFFIX}
11 + ARCHIVE DESTINATION lib${LIB_SUFFIX}
12 )
13 endmacro(clhep_build_library)
14
15 @@ -78,8 +78,8 @@
16 INSTALL(TARGETS CLHEP CLHEPS
17 EXPORT CLHEPLibraryDepends
18 RUNTIME DESTINATION bin
19 - LIBRARY DESTINATION lib
20 - ARCHIVE DESTINATION lib
21 + LIBRARY DESTINATION lib${LIB_SUFFIX}
22 + ARCHIVE DESTINATION lib${LIB_SUFFIX}
23 )
24
25 if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
26 @@ -91,9 +91,9 @@
27 else()
28 # create the symbolic links
29 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink
30 - "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\" )" )
31 + "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"$ENV{DESTDIR}S{CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" )
32 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink
33 - "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/lib\" )" )
34 + "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" )
35 endif()
36
37 INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink )
38 diff -Nur CLHEP.orig/cmake/Modules/ClhepToolchain.cmake CLHEP/cmake/Modules/ClhepToolchain.cmake
39 --- CLHEP.orig/cmake/Modules/ClhepToolchain.cmake 2011-12-16 00:07:27.000000000 +0000
40 +++ CLHEP/cmake/Modules/ClhepToolchain.cmake 2012-08-07 17:48:57.000000000 +0100
41 @@ -63,7 +63,7 @@
42 #
43 set(CLHEP_PKGCONFIG_PREFIX ${PROJECT_BINARY_DIR})
44 set(CLHEP_PKGCONFIG_INCLUDEDIR ${CLHEP_INCLUDE_DIR})
45 -set(CLHEP_PKGCONFIG_LIBDIR ${PROJECT_BINARY_DIR}/lib)
46 +set(CLHEP_PKGCONFIG_LIBDIR ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
47
48 configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/clhep.pc.in
49 ${PROJECT_BINARY_DIR}/clhep.pc
50 @@ -84,7 +84,7 @@
51 # We use a relative path from the directory where the CLHEPConfig.cmake
52 # file is installed to the actual include dir.
53 file(RELATIVE_PATH _relincpath
54 - ${CMAKE_INSTALL_PREFIX}/lib/CLHEP-${VERSION}
55 + ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/CLHEP-${VERSION}
56 ${CMAKE_INSTALL_PREFIX}/include
57 )
58 set(CLHEP_INCLUDE_DIR "\${_thisdir}/${_relincpath}")
59 @@ -111,7 +111,7 @@
60 # If you later use GNUInstallDirs.cmake, this would need more work to
61 # ensure accurate calculation of the relative path.
62 set(CLHEP_PKGCONFIG_PREFIX "\${pcfiledir}/../..")
63 -set(CLHEP_PKGCONFIG_LIBDIR "\${prefix}/lib")
64 +set(CLHEP_PKGCONFIG_LIBDIR "\${prefix}/lib${LIB_SUFFIX}")
65 set(CLHEP_PKGCONFIG_INCLUDEDIR "\${prefix}/include")
66
67 configure_file(${PROJECT_SOURCE_DIR}/cmake/Templates/clhep.pc.in
68 @@ -129,16 +129,16 @@
69 install(FILES
70 ${PROJECT_BINARY_DIR}/InstallTreeFiles/CLHEPConfigVersion.cmake
71 ${PROJECT_BINARY_DIR}/InstallTreeFiles/CLHEPConfig.cmake
72 - DESTINATION lib/CLHEP-${VERSION}
73 + DESTINATION lib${LIB_SUFFIX}/CLHEP-${VERSION}
74 )
75
76 -install(EXPORT CLHEPLibraryDepends DESTINATION lib/CLHEP-${VERSION})
77 +install(EXPORT CLHEPLibraryDepends DESTINATION lib${LIB_SUFFIX}/CLHEP-${VERSION})
78
79 # Install the pkg-config file. The choice of 'lib/pkgconfig' for the
80 # installation seems fairly standard.
81 install(FILES
82 ${PROJECT_BINARY_DIR}/InstallTreeFiles/clhep.pc
83 - DESTINATION lib/pkgconfig
84 + DESTINATION lib${LIB_SUFFIX}/pkgconfig
85 )
86
87 # - And we should be done...

  ViewVC Help
Powered by ViewVC 1.1.20