[med-svn] [Git][med-team/ismrmrd][master] Rename static lib in CMakeLists.txt

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / ismrmrd


Commits:
d385a81e by Nilesh Patra at 2020-09-20T17:34:16+05:30
Rename static lib in CMakeLists.txt

- - - - -


3 changed files:

- debian/control
- debian/patches/add_static_lib.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -6,7 +6,6 @@ Priority: optional
 Build-Depends: cmake,
                debhelper-compat (= 13),
                d-shlibs,
-               rename,
                libboost-program-options-dev,
                libboost-test-dev,
                libfftw3-dev,


=====================================
debian/patches/add_static_lib.patch
=====================================
@@ -4,7 +4,7 @@ Description: Add static library
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -195,6 +195,7 @@ endif ()
+@@ -195,6 +195,7 @@
  # main library
  include_directories(${ISMRMRD_TARGET_INCLUDE_DIRS})
  add_library(ismrmrd SHARED ${ISMRMRD_TARGET_SOURCES})
@@ -12,21 +12,22 @@ Description: Add static library
  add_library(ismrmrd::ismrmrd ALIAS ismrmrd)
  set_target_properties(ismrmrd PROPERTIES
    VERSION ${ISMRMRD_VERSION_STRING}
-@@ -205,8 +206,13 @@ set_target_properties(ismrmrd
+@@ -205,8 +206,13 @@
    PROPERTIES
    EXPORT_NAME ISMRMRD
    INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include>)
+-
 +set_target_properties(ismrmrd_static
 +  PROPERTIES
 +  EXPORT_NAME ISMRMRD
-+  INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include>)
- 
++  INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_INTERFACE:include>
++  OUTPUT_NAME "ismrmrd")
  target_link_libraries(ismrmrd ${ISMRMRD_TARGET_LINK_LIBS})
 +target_link_libraries(ismrmrd_static ${ISMRMRD_TARGET_LINK_LIBS})
  list(APPEND ISMRMRD_LIBRARIES ismrmrd) # Add to list of libraries to be found
  list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libraries
  
-@@ -219,6 +225,7 @@ install(TARGETS ismrmrd EXPORT ISMRMRDTa
+@@ -219,6 +225,7 @@
     RUNTIME DESTINATION bin
     COMPONENT Devel
  )


=====================================
debian/rules
=====================================
@@ -21,8 +21,6 @@ override_dh_auto_build-indep:
 
 override_dh_install-arch:
 	dh_install -a
-	# FIXME: If you know how to rename the static lib inside debian/patches/add_static_lib.patch that would be better than this hack
-	file-rename 's/_static\.a/.a/' `find debian -name libismrmrd_static.a`
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \



View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/commit/d385a81ed45461b12a8f0d4100b1c1365dfadbea

-- 
View it on GitLab: https://salsa.debian.org/med-team/ismrmrd/-/commit/d385a81ed45461b12a8f0d4100b1c1365dfadbea
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200920/25da3a4c/attachment-0001.html>