mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
sci-libs/liborigin: no static libs
Closes: https://bugs.gentoo.org/828534 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a8e5914..6401a30 100644
|
||||
index a8e5914..a1a129c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -41,7 +41,6 @@ set (devel-headers
|
||||
@@ -10,15 +10,21 @@ index a8e5914..6401a30 100644
|
||||
)
|
||||
|
||||
# allow for installation of individual targets
|
||||
@@ -65,6 +64,7 @@ add_library (origin_static STATIC $<TARGET_OBJECTS:origin>)
|
||||
set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" )
|
||||
@@ -59,12 +58,8 @@ else()
|
||||
message("File parsing will NOT be logged. Define GENERATE_CODE_FOR_LOG to activate logging.")
|
||||
endif ()
|
||||
|
||||
-# Static library
|
||||
-add_library (origin_static STATIC $<TARGET_OBJECTS:origin>)
|
||||
-
|
||||
-set_target_properties(origin_static PROPERTIES OUTPUT_NAME "origin" )
|
||||
-
|
||||
if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
|
||||
+ include(GNUInstallDirs)
|
||||
|
||||
# Shared library
|
||||
add_library( origin_shared SHARED $<TARGET_OBJECTS:origin>)
|
||||
@@ -74,13 +74,14 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
|
||||
@@ -74,15 +69,16 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
|
||||
SOVERSION ${PROJECT_VERSION_MAJOR}
|
||||
)
|
||||
# Generate a pkg-config file matching this config
|
||||
@@ -28,14 +34,18 @@ index a8e5914..6401a30 100644
|
||||
+ if(ENABLE_TOOLS)
|
||||
# command line util
|
||||
add_executable(opj2dat opj2dat.cpp)
|
||||
target_link_libraries (opj2dat origin_static)
|
||||
- target_link_libraries (opj2dat origin_static)
|
||||
+ target_link_libraries (opj2dat origin_shared)
|
||||
+ endif ()
|
||||
|
||||
- include(GNUInstallDirs)
|
||||
# install libraries
|
||||
install( TARGETS origin_shared origin_static
|
||||
- install( TARGETS origin_shared origin_static
|
||||
+ install( TARGETS origin_shared
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
@@ -92,7 +93,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
@@ -92,7 +88,9 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" )
|
||||
# install pkg-config file
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liborigin.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user