Committing Nico's change about build system improvements for LAPACK

"One of the improvements with the patches is that SOVERSION and VERSION are now properly set and the proper symlinks are created:
```
liblapack.so -> liblapack.so.3
liblapack.so.3 -> liblapack.so.3.5.0
liblapack.so.3.5.0
```
Since BLAS is shipped with LAPACK and no separate version number is given for BLAS, I applied the same there, too."

Tested on Julie's Mac

TO DO: To test under Windows
====

Updated OSX RPATH settings
In response to CMake 3.0 generating warnings regarding policy CMP0042,
the OSX RPATH settings have been updated per recommendations found
in the CMake Wiki:
  http://www.cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH

diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt
index e99ff79a012f6941c878317b1668d338e88f84fb..7d8066c44e23b771024683b5612cc44532e88fb3 100644 (file)
--- a/BLAS/SRC/CMakeLists.txt
+++ b/BLAS/SRC/CMakeLists.txt
@@ -137,8 +137,13 @@ endif()
   
   
 add_library(blas ${ALLOBJ})
-if(UNIX)
-  target_link_libraries(blas m)
-endif()
+#if(UNIX)
+#  target_link_libraries(blas m)
+#endif()
+set_target_properties(
+  blas PROPERTIES
+  VERSION ${LAPACK_VERSION}
+  SOVERSION ${LAPACK_MAJOR_VERSION}
+  )
 target_link_libraries(blas)
 lapack_install_library(blas)

diff --git a/CMAKE/lapack-config-version.cmake.in b/CMAKE/lapack-config-version.cmake.in
deleted file mode 100644 (file)
index 2caeb4a..0000000
--- a/CMAKE/lapack-config-version.cmake.in
+++ /dev/null
@@ -1,8 +0,0 @@
-set(PACKAGE_VERSION "@LAPACK_VERSION@")
-if(NOT ${PACKAGE_FIND_VERSION} VERSION_GREATER ${PACKAGE_VERSION})
-  set(PACKAGE_VERSION_COMPATIBLE 1)
-  if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
-    set(PACKAGE_VERSION_EXACT 1)
-  endif()
-endif()
-

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e19060d4b865d09918ddcc04582374589d194e3..5d4e14cf7e74c9c187a617fdbcf00149c3b5c82b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,32 @@
 cmake_minimum_required(VERSION 2.8.10)
 project(LAPACK Fortran)
 
-set(LAPACK_VERSION 3.5.0)
+set(LAPACK_MAJOR_VERSION 3)
+set(LAPACK_MINOR_VERSION 5)
+set(LAPACK_PATCH_VERSION 0)
+set(
+  LAPACK_VERSION
+  ${LAPACK_MAJOR_VERSION}.${LAPACK_MINOR_VERSION}.${LAPACK_PATCH_VERSION}
+  )
+
+# Updated OSX RPATH settings
+# In response to CMake 3.0 generating warnings regarding policy CMP0042,
+# the OSX RPATH settings have been updated per recommendations found
+# in the CMake Wiki:
+#  http://www.cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH
+    set(CMAKE_MACOSX_RPATH ON)
+    set(CMAKE_SKIP_BUILD_RPATH FALSE)
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+    set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+    list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+    if("${isSystemDir}" STREQUAL "-1")
+        set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+    endif()
+
 
 # Configure the warning and code coverage suppression file
-configure_file( 
+configure_file(
   "${LAPACK_SOURCE_DIR}/CTestCustom.cmake.in"
   "${LAPACK_BINARY_DIR}/CTestCustom.cmake"
   COPYONLY
@@ -35,12 +57,23 @@ endif()
 
 set(LAPACK_INSTALL_EXPORT_NAME lapack-targets)
 
+if (UNIX)
+  include(GNUInstallDirs)
+  set(ARCHIVE_DIR ${CMAKE_INSTALL_LIBDIR})
+  set(LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})
+  set(RUNTIME_DIR ${CMAKE_INSTALL_BINDIR})
+else()
+  set(ARCHIVE_DIR lib${LIB_SUFFIX})
+  set(LIBRARY_DIR lib${LIB_SUFFIX})
+  set(RUNTIME_DIR bin)
+endif()
+
 macro(lapack_install_library lib)
   install(TARGETS ${lib}
     EXPORT ${LAPACK_INSTALL_EXPORT_NAME}
-    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-    LIBRARY DESTINATION lib${LIB_SUFFIX}
-    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION ${ARCHIVE_DIR}
+    LIBRARY DESTINATION ${LIBRARY_DIR}
+    RUNTIME DESTINATION ${RUNTIME_DIR}
   )
 endmacro()
 
@@ -77,9 +110,7 @@ message(STATUS "--> Will use second_${TIME_FUNC}.f and dsecnd_${TIME_FUNC}.f as
 
 set(SECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/second_${TIME_FUNC}.f)
 set(DSECOND_SRC  ${LAPACK_SOURCE_DIR}/INSTALL/dsecnd_${TIME_FUNC}.f)
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-set(PKG_CONFIG_DIR ${libdir}/pkgconfig)
+set(PKG_CONFIG_DIR ${LIBRARY_DIR}/pkgconfig)
 
 # --------------------------------------------------
 # Precision to build
@@ -271,7 +302,7 @@ endif(BUILD_TESTING OR LAPACKE_WITH_TMG)
 set(_lapack_config_install_guard_target "")
 if(ALL_TARGETS)
   install(EXPORT lapack-targets
-    DESTINATION lib/cmake/lapack-${LAPACK_VERSION})
+    DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION})
 
   # Choose one of the lapack targets to use as a guard for
   # lapack-config.cmake to load targets from the install tree.
@@ -298,8 +329,6 @@ if(ALL_TARGETS)
   list(GET ALL_TARGETS 0 _lapack_config_build_guard_target)
 endif()
 
-configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-version.cmake.in
-  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake @ONLY)
 configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-build.cmake.in
   ${LAPACK_BINARY_DIR}/lapack-config.cmake @ONLY)
 
@@ -312,8 +341,16 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/lapack.pc.in ${CMAKE_CURRENT_BINARY_D
 
 configure_file(${LAPACK_SOURCE_DIR}/CMAKE/lapack-config-install.cmake.in
   ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake @ONLY)
+
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+  ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
+  VERSION ${LAPACK_VERSION}
+  COMPATIBILITY SameMajorVersion
+  )
+
 install(FILES
   ${LAPACK_BINARY_DIR}/CMakeFiles/lapack-config.cmake
   ${LAPACK_BINARY_DIR}/lapack-config-version.cmake
-  DESTINATION lib/cmake/lapack-${LAPACK_VERSION}
+  DESTINATION ${LIBRARY_DIR}/cmake/lapack-${LAPACK_VERSION}
   )

diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
index 30edabe4f04b5de6ef05f1fa77fb1aa382e4af71..9b204fe424da4a1f59fe6b183cccc67ec8ec37ac 100644 (file)
--- a/SRC/CMakeLists.txt
+++ b/SRC/CMakeLists.txt
@@ -452,4 +452,11 @@ list(REMOVE_DUPLICATES ALLOBJ)
 
 add_library(lapack ${ALLOBJ} ${ALLXOBJ})
 target_link_libraries(lapack ${BLAS_LIBRARIES} ${XBLAS_LIBRARY})
+
+set_target_properties(
+  lapack PROPERTIES
+  VERSION ${LAPACK_VERSION}
+  SOVERSION ${LAPACK_MAJOR_VERSION}
+  )
+
 lapack_install_library(lapack)