Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 541824 Details for
Bug 597768
new package: sci-libs/libmed (3.3.1)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
libmed-3.3.1-cmakelist.patch
libmed-3.3.1-cmakelist.patch (text/plain), 2.76 KB, created by
Fabio Rossi
on 2018-07-30 23:07:00 UTC
(
hide
)
Description:
libmed-3.3.1-cmakelist.patch
Filename:
MIME Type:
Creator:
Fabio Rossi
Created:
2018-07-30 23:07:00 UTC
Size:
2.76 KB
patch
obsolete
>--- a/src/CMakeLists.txt 2018-07-28 16:37:01.180598992 +0200 >+++ a/src/CMakeLists.txt.new 2018-07-28 17:14:49.147775461 +0200 >@@ -1,7 +1,3 @@ >-INCLUDE_DIRECTORIES( >- ${HDF5_INCLUDE_DIRS} >- ${MPI_INCLUDE_DIRS}) >- > # On Win platform, we need to make sure symbols are properly exported in > # the intermediary OBJECT targes built in the sub-directories: > # The definition "-D<target>_EXPORTS" is normally added automatically by CMake >@@ -19,6 +15,12 @@ > INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include > ${PROJECT_SOURCE_DIR}/include) > >+# these includes must go after project ones to avoid masking by >+# previous versions already installed >+INCLUDE_DIRECTORIES( >+ ${HDF5_INCLUDE_DIRS} >+ ${MPI_INCLUDE_DIRS}) >+ > # Get pure C intermediary targets: > ADD_SUBDIRECTORY(hdfi) > ADD_SUBDIRECTORY(ci) >@@ -107,7 +109,7 @@ > IF(MEDFILE_BUILD_SHARED_LIBS) > ## Intermediate library - this is unavoidable > ## if we want the Fortran wrapper to build correctly under win. >- ADD_LIBRARY(medfwrap STATIC ${medfort_wrap_SOURCES}) >+ ADD_LIBRARY(medfwrap SHARED ${medfort_wrap_SOURCES}) > TARGET_LINK_LIBRARIES(medfwrap medC) > INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib64) > >--- a/tools/mdump/CMakeLists.txt 2018-07-29 09:24:35.714930029 +0200 >+++ a/tools/mdump/CMakeLists.txt.new 2018-07-29 09:58:48.667089767 +0200 >@@ -33,6 +33,6 @@ > CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY) > > INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin) >-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") >-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)") >+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") >+INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")") > >--- a/src/2.3.6/CMakeLists.txt 2018-07-30 22:45:56.205079148 +0200 >+++ a/src/2.3.6/CMakeLists.txt.new 2018-07-30 22:49:43.520096835 +0200 >@@ -1,8 +1,3 @@ >-INCLUDE_DIRECTORIES( >- ${HDF5_INCLUDE_DIRS} >- ${MPI_INCLUDE_DIRS} >-) >- > SET(med236_SOURCES MEDaffiche.c) > > # Definitions >@@ -13,6 +8,13 @@ > "${PROJECT_BINARY_DIR}/include/2.3.6" > "${PROJECT_SOURCE_DIR}/include/2.3.6") > >+# these includes must go after project ones to avoid masking by >+# previous versions already installed >+INCLUDE_DIRECTORIES( >+ ${HDF5_INCLUDE_DIRS} >+ ${MPI_INCLUDE_DIRS} >+) >+ > # Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236 > # (and their static counterpart): > ADD_SUBDIRECTORY(cfi)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 597768
:
450984
|
450986
|
450988
|
450990
|
496624
|
496626
|
496628
|
516340
|
516342
|
516344
|
530768
|
530770
|
530772
|
541820
|
541822
| 541824 |
541826
|
541828
|
541830
|
541832
|
541834
|
541952
|
542064
|
562970
|
562972
|
562974
|
562976