diff options
Diffstat (limited to 'sys-cluster/scr/files/scr-3.0_pre2-no-static.patch')
| -rw-r--r-- | sys-cluster/scr/files/scr-3.0_pre2-no-static.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/sys-cluster/scr/files/scr-3.0_pre2-no-static.patch b/sys-cluster/scr/files/scr-3.0_pre2-no-static.patch new file mode 100644 index 000000000..2d63ebae8 --- /dev/null +++ b/sys-cluster/scr/files/scr-3.0_pre2-no-static.patch @@ -0,0 +1,76 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -83,16 +83,6 @@ + INSTALL(TARGETS scr DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ENDIF() + +-ADD_LIBRARY(scr-static STATIC $<TARGET_OBJECTS:scr_o>) +-IF(SCR_LINK_STATIC) +- SET_TARGET_PROPERTIES(scr-static PROPERTIES LINK_SEARCH_START_STATIC 1) +- SET_TARGET_PROPERTIES(scr-static PROPERTIES LINK_SEARCH_END_STATIC 1) +-ENDIF(SCR_LINK_STATIC) +-TARGET_LINK_LIBRARIES(scr-static ${SCR_EXTERNAL_LIBS}) +- +-SET_TARGET_PROPERTIES(scr-static PROPERTIES OUTPUT_NAME scr CLEAN_DIRECT_OUTPUT 1) +-INSTALL(TARGETS scr-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- + # Non-MPI library for CLI + ADD_LIBRARY(cliscr_noMPI_o OBJECT ${cliscr_noMPI_srcs}) + +@@ -103,16 +93,6 @@ + INSTALL(TARGETS scr_base DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ENDIF(BUILD_SHARED_LIBS) + +-ADD_LIBRARY(scr_base-static STATIC $<TARGET_OBJECTS:cliscr_noMPI_o>) +-IF(SCR_LINK_STATIC) +- SET_TARGET_PROPERTIES(scr_base-static PROPERTIES LINK_SEARCH_START_STATIC 1) +- SET_TARGET_PROPERTIES(scr_base-static PROPERTIES LINK_SEARCH_END_STATIC 1) +-ENDIF(SCR_LINK_STATIC) +-TARGET_LINK_LIBRARIES(scr_base-static ${SCR_EXTERNAL_SERIAL_LIBS}) +- +-SET_TARGET_PROPERTIES(scr_base-static PROPERTIES OUTPUT_NAME scr_base CLEAN_DIRECT_OUTPUT 1) +-INSTALL(TARGETS scr_base-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- + # Fortran + IF(ENABLE_FORTRAN) + IF(BUILD_SHARED_LIBS) +@@ -121,17 +101,6 @@ + SET_TARGET_PROPERTIES(scrf PROPERTIES OUTPUT_NAME scrf CLEAN_DIRECT_OUTPUT 1) + INSTALL(TARGETS scrf DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ENDIF() +- +- ADD_LIBRARY(scrf-static STATIC scrf.c $<TARGET_OBJECTS:scr_o>) +- IF(SCR_LINK_STATIC) +- SET_TARGET_PROPERTIES(scrf-static PROPERTIES LINK_SEARCH_START_STATIC 1) +- SET_TARGET_PROPERTIES(scrf-static PROPERTIES LINK_SEARCH_END_STATIC 1) +- TARGET_LINK_LIBRARIES(scrf-static ${SCR_EXTERNAL_LIBS}) +- ENDIF(SCR_LINK_STATIC) +- TARGET_LINK_LIBRARIES(scrf-static ${SCR_EXTERNAL_LIBS}) +- +- SET_TARGET_PROPERTIES(scrf-static PROPERTIES OUTPUT_NAME scrf CLEAN_DIRECT_OUTPUT 1) +- INSTALL(TARGETS scrf-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) + ENDIF(ENABLE_FORTRAN) + + ########### +@@ -164,21 +133,13 @@ + # Build and install C binaries + FOREACH(bin IN ITEMS ${cliscr_c_bins}) + ADD_EXECUTABLE(${bin} ${bin}.c) +- IF(SCR_LINK_STATIC) +- TARGET_LINK_LIBRARIES(${bin} scr_base-static) +- ELSE(SCR_LINK_STATIC) + TARGET_LINK_LIBRARIES(${bin} scr_base) +- ENDIF(SCR_LINK_STATIC) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${bin} DESTINATION ${CMAKE_INSTALL_BINDIR}) + ENDFOREACH(bin IN ITEMS ${cliscr_c_bins}) + + # Build and install CLI binaries that link full SCR library + FOREACH(bin IN ITEMS ${cliscr_scr_bins}) + ADD_EXECUTABLE(${bin} ${bin}.c) +- IF(SCR_LINK_STATIC) +- TARGET_LINK_LIBRARIES(${bin} scr-static) +- ELSE(SCR_LINK_STATIC) + TARGET_LINK_LIBRARIES(${bin} scr) +- ENDIF(SCR_LINK_STATIC) + INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${bin} DESTINATION ${CMAKE_INSTALL_BINDIR}) + ENDFOREACH(bin IN ITEMS ${cliscr_scr_bins}) |