From 37c4024bf59f7bad11b485174b2ad443269ab1ea Mon Sep 17 00:00:00 2001 From: Damian Rouson Date: Thu, 14 Dec 2017 15:33:45 -0800 Subject: [PATCH] Match CMake lib OUTPUT_NAME to current practice --- base/CMakeLists.txt | 4 ++-- krylov/CMakeLists.txt | 4 ++-- prec/CMakeLists.txt | 4 ++-- util/CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 0ebc102e0..5e543441c 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -456,14 +456,14 @@ set_target_properties(base Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE SOVERSION ${PSBLAS_SO_VERSION} - OUTPUT_NAME base + OUTPUT_NAME psb_base ) set_target_properties(base_static PROPERTIES Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE SOVERSION ${PSBLAS_SO_VERSION} - OUTPUT_NAME base_static + OUTPUT_NAME psb_base ) target_link_libraries(base PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES}) target_link_libraries(base_static PRIVATE ${MPI_C_LIBRARIES} ${MPI_Fortran_LIBRARIES}) diff --git a/krylov/CMakeLists.txt b/krylov/CMakeLists.txt index f929cae60..6bab1b0f0 100644 --- a/krylov/CMakeLists.txt +++ b/krylov/CMakeLists.txt @@ -145,14 +145,14 @@ set_target_properties ( krylov SOVERSION ${PSBLAS_SO_VERSION} Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE - OUTPUT_NAME krylov + OUTPUT_NAME psb_krylov ) set_target_properties( krylov_static PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE - OUTPUT_NAME krylov_static + OUTPUT_NAME psb_krylov ) get_target_property(libkrylov_static krylov_static OUTPUT_NAME) diff --git a/prec/CMakeLists.txt b/prec/CMakeLists.txt index 313f3097f..1fd0a887d 100644 --- a/prec/CMakeLists.txt +++ b/prec/CMakeLists.txt @@ -161,14 +161,14 @@ set_target_properties ( prec SOVERSION ${PSBLAS_SO_VERSION} Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE - OUTPUT_NAME prec + OUTPUT_NAME psb_prec ) set_target_properties( prec_static PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE - OUTPUT_NAME prec_static + OUTPUT_NAME psb_prec ) get_target_property(libprec_static prec_static OUTPUT_NAME) diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt index 07178d66c..d618497a8 100644 --- a/util/CMakeLists.txt +++ b/util/CMakeLists.txt @@ -133,14 +133,14 @@ set_target_properties ( util SOVERSION ${PSBLAS_SO_VERSION} Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE - OUTPUT_NAME util + OUTPUT_NAME psb_util ) set_target_properties( util_static PROPERTIES SOVERSION ${PSBLAS_SO_VERSION} Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}" POSITION_INDEPENDENT_CODE TRUE - OUTPUT_NAME util_static + OUTPUT_NAME psb_util ) get_target_property(libutil_static util_static OUTPUT_NAME)