Skip to content

Commit c677978

Browse files
committed
Install .cmake files in CMAKE_INSTALL_LIBDIR
This avoid problems when build and install 64 and 32 bits libs at same time, because both overwrite the .cmake files if install it in an non-architecture depend path like is `share/cmake/foo` is. cmake now pick the correct .cmake files when try to add to another project as depencies
1 parent c94cfef commit c677978

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ if (NOT NOFORTRAN)
321321
if (NOT ONLY_CBLAS)
322322
# Build test and ctest
323323
add_subdirectory(test)
324-
endif()
324+
endif()
325325
if (BUILD_TESTING)
326326
add_subdirectory(lapack-netlib/TESTING)
327327
endif()
@@ -438,7 +438,7 @@ if (BUILD_SHARED_LIBS AND NOT ${SYMBOLPREFIX}${SYMBOLSUFFIX} STREQUAL "")
438438
endif()
439439
if (NOT USE_PERL)
440440
add_custom_command(TARGET ${OpenBLAS_LIBNAME}_shared POST_BUILD
441-
COMMAND ${PROJECT_SOURCE_DIR}/exports/gensymbol "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BLD}" "${BBF16}" "${BS}" "${BD}" "${BC}" "${BZ}" > ${PROJECT_BINARY_DIR}/objcopy.def
441+
COMMAND ${PROJECT_SOURCE_DIR}/exports/gensymbol "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BLD}" "${BBF16}" "${BS}" "${BD}" "${BC}" "${BZ}" > ${PROJECT_BINARY_DIR}/objcopy.def
442442
COMMAND objcopy -v --redefine-syms ${PROJECT_BINARY_DIR}/objcopy.def ${PROJECT_BINARY_DIR}/lib/lib${OpenBLAS_LIBNAME}.so
443443
COMMENT "renaming symbols"
444444
)
@@ -549,9 +549,8 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/
549549
install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/)
550550

551551

552-
# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
553552
set(PN OpenBLAS)
554-
set(CMAKECONFIG_INSTALL_DIR "share/cmake/${PN}${SUFFIX64}")
553+
set(CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PN}${SUFFIX64}")
555554
configure_package_config_file(cmake/${PN}Config.cmake.in
556555
"${CMAKE_CURRENT_BINARY_DIR}/${PN}${SUFFIX64}Config.cmake"
557556
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})

0 commit comments

Comments
 (0)