diff --git a/libs/cfitsio/cfitsio-3.45-20180706.diff b/libs/cfitsio/cfitsio-3.45-20180706.diff index 6dfd9636..4b8ca025 100644 --- a/libs/cfitsio/cfitsio-3.45-20180706.diff +++ b/libs/cfitsio/cfitsio-3.45-20180706.diff @@ -1,19 +1,16 @@ diff -Nrub -x '*~' -x '*\.rej' -x '*\.orig' -x '*\.o' -x '*\.pyc' cfitsio.orig/CMakeLists.txt cfitsio/CMakeLists.txt ---- cfitsio.orig/CMakeLists.txt 2018-05-09 22:16:00.000000000 +0300 -+++ cfitsio/CMakeLists.txt 2018-07-05 23:07:15.963098800 +0300 -@@ -119,7 +119,14 @@ +--- cfitsio.orig/CMakeLists.txt 2018-05-09 20:16:00.000000000 +0100 ++++ cfitsio/CMakeLists.txt 2018-07-05 23:14:30.568881000 +0100 +@@ -119,7 +119,11 @@ TARGET_LINK_LIBRARIES(${LIB_NAME} ${PTHREADS_LIBRARY} ${M_LIB} ${CURL_LIBRARIES}) - + SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION}) -install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION}) -+#install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION}) -+include(GNUInstallDirs) -+message("CMake install lib dir is " ${CMAKE_INSTALL_LIBDIR}) -+install(TARGETS ${LIB_NAME} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib/static) -+ ++install(TARGETS ${LIB_NAME} ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ install(FILES ${H_FILES} DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) - + ENABLE_TESTING() diff --git a/libs/cfitsio/cfitsio.py b/libs/cfitsio/cfitsio.py index e0b3d7ef..eddfe1b9 100644 --- a/libs/cfitsio/cfitsio.py +++ b/libs/cfitsio/cfitsio.py @@ -1,31 +1,32 @@ import info class subinfo(info.infoclass): def setTargets(self): for ver in ['3.08', '3.10', '3.14', '3.20', '3.31', '3.35', '3.45']: self.targets[ver] = 'ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio' + ver.replace(".", "") + '0.tar.gz' self.targetInstSrc[ver] = "cfitsio" self.targetDigests['3.20'] = 'f200fe0acba210e88e230add6a4e68d80ad3d4f2' self.targetDigests['3.31'] = '35360dccc69dc5f12efb6fc9096ad951b59244d5' self.targetDigests['3.35'] = 'e928832708d6a5df21a1e17ae4a63036cab7c1b9' + self.targetDigests['3.45'] = (['bf6012dbe668ecb22c399c4b7b2814557ee282c74a7d5dc704eb17c30d9fb92e'], CraftHash.HashAlgorithm.SHA256) self.patchToApply['3.20'] = [("cfitsio-20101130.diff", 1)] self.patchToApply['3.31'] = [("cfitsio-20130124.diff", 1)] self.patchToApply['3.35'] = [("cfitsio-20130124.diff", 1)] - self.patchToApply['3.45'] = [("cfitsio-3.45-20180706.diff", 1)] + self.patchToApply['3.45'] = [("cfitsio-3.45-20180706.diff", 1)] self.description = "library for the FITS (Flexible Image Transport System) file format" self.defaultTarget = '3.45' def setDependencies(self): self.runtimeDependencies["virtual/base"] = "default" from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) self.subinfo.options.configure.args = "-DENABLE_STATIC=ON"