Fix CMake errors

pull/5/head
Izaak Beekman 9 years ago
parent fe2569ecc5
commit e5571d1b53

@ -336,7 +336,8 @@ write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake"
VERSION "${psblas_VERSION}" VERSION "${psblas_VERSION}"
COMPATIBILITY SameMajorVersion COMPATIBILITY SameMajorVersion
) )
configure_file("${CMAKE_SOURCE_DIR}/cmake/pkg/${CMAKE_PROJECT_NAME}Config.cmake.in" configure_file("${CMAKE_SOURCE_DIR}/cmake/pkg/${CMAKE_PROJECT_NAME}Config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CMAKE_PROJECT_NAME}Config.cmake" @ONLY) "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${CMAKE_PROJECT_NAME}Config.cmake" @ONLY)

@ -463,7 +463,7 @@ install(DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/" DESTINATION
FILES_MATCHING PATTERN "*.mod") FILES_MATCHING PATTERN "*.mod")
install(TARGETS base install(TARGETS base
EXPORT PSBLAS_Targets EXPORT ${CMAKE_PROJECT_NAME}-targets
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )

@ -14,4 +14,3 @@ include ( "${@PACKAGE_NAME@_CONFIG_INSTALL_DIR}/@PACKAGE_NAME@-targets.cmake" )
# Make the module files available via include # Make the module files available via include
set_and_check ( @CMAKE_PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_INSTALL_MOD_DIR@" ) set_and_check ( @CMAKE_PROJECT_NAME@_INCLUDE_DIRS "@PACKAGE_INSTALL_MOD_DIR@" )

@ -146,7 +146,7 @@ set_target_properties ( krylov
OUTPUT_NAME psb_krylov OUTPUT_NAME psb_krylov
) )
install(TARGETS krylov EXPORT PSBLAS_Targets install(TARGETS krylov EXPORT ${CMAKE_PROJECT_NAME}-targets
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )

@ -163,7 +163,7 @@ set_target_properties ( prec
OUTPUT_NAME psb_prec OUTPUT_NAME psb_prec
) )
install(TARGETS prec EXPORT PSBLAS_Targets install(TARGETS prec EXPORT ${CMAKE_PROJECT_NAME}-targets
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )

@ -134,7 +134,7 @@ set_target_properties ( util
OUTPUT_NAME psb_util OUTPUT_NAME psb_util
) )
install(TARGETS util EXPORT PSBLAS_Targets install(TARGETS util EXPORT ${CMAKE_PROJECT_NAME}-targets
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )

Loading…
Cancel
Save