mirror of
https://github.com/gentoo-mirror/guru.git
synced 2025-04-21 07:52:21 -04:00
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -57,16 +57,6 @@
|
|
INSTALL(TARGETS kvtree DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
ENDIF()
|
|
|
|
-ADD_LIBRARY(kvtree-static STATIC $<TARGET_OBJECTS:kvtree_o>)
|
|
-IF(KVTREE_LINK_STATIC)
|
|
- SET_TARGET_PROPERTIES(kvtree-static PROPERTIES LINK_SEARCH_START_STATIC 1)
|
|
- SET_TARGET_PROPERTIES(kvtree-static PROPERTIES LINK_SEARCH_END_STATIC 1)
|
|
-ENDIF(KVTREE_LINK_STATIC)
|
|
-TARGET_LINK_LIBRARIES(kvtree-static ${KVTREE_EXTERNAL_LIBS})
|
|
-
|
|
-SET_TARGET_PROPERTIES(kvtree-static PROPERTIES OUTPUT_NAME kvtree CLEAN_DIRECT_OUTPUT 1)
|
|
-INSTALL(TARGETS kvtree-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
-
|
|
# KVTREE base Library (no MPI)
|
|
ADD_LIBRARY(kvtree_noMPI_o OBJECT ${libkvtree_noMPI_srcs})
|
|
|
|
@@ -77,16 +67,6 @@
|
|
INSTALL(TARGETS kvtree_base DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
ENDIF(BUILD_SHARED_LIBS)
|
|
|
|
-ADD_LIBRARY(kvtree_base-static STATIC $<TARGET_OBJECTS:kvtree_noMPI_o>)
|
|
-IF(KVTREE_LINK_STATIC)
|
|
- SET_TARGET_PROPERTIES(kvtree_base-static PROPERTIES LINK_SEARCH_START_STATIC 1)
|
|
- SET_TARGET_PROPERTIES(kvtree_base-static PROPERTIES LINK_SEARCH_END_STATIC 1)
|
|
-ENDIF(KVTREE_LINK_STATIC)
|
|
-TARGET_LINK_LIBRARIES(kvtree_base-static ${KVTREE_SERIAL_LIBS})
|
|
-
|
|
-SET_TARGET_PROPERTIES(kvtree_base-static PROPERTIES OUTPUT_NAME kvtree_base CLEAN_DIRECT_OUTPUT 1)
|
|
-INSTALL(TARGETS kvtree_base-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
-
|
|
###########
|
|
# CLI KVTREE #
|
|
###########
|
|
@@ -99,10 +79,6 @@
|
|
# Build and install C binaries
|
|
FOREACH(bin IN ITEMS ${clikvtree_c_bins})
|
|
ADD_EXECUTABLE(${bin} ${bin}.c)
|
|
- IF(KVTREE_LINK_STATIC)
|
|
- TARGET_LINK_LIBRARIES(${bin} kvtree-static)
|
|
- ELSE()
|
|
TARGET_LINK_LIBRARIES(${bin} kvtree)
|
|
- ENDIF()
|
|
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${bin} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
ENDFOREACH(bin IN ITEMS ${clikvtree_c_bins})
|