Skip to content

Commit 5c35bdc

Browse files
committed
fix EP install of the generated library (there was lib install path mismatch on 64-bit linux)
1 parent 04a99b4 commit 5c35bdc

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

export/CMakeLists.txt.export

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ set(LIBINT2_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}"
120120
CACHE PATH "LIBINT2 INCLUDE install directory")
121121
set(LIBINT2_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}"
122122
CACHE PATH "LIBINT2 LIB install directory")
123-
set(LIBINT2_INSTALL_DATADIR "share/libint/${LIBINT_VERSION}"
123+
set(LIBINT2_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/libint/${LIBINT_VERSION}"
124124
CACHE PATH "LIBINT2 DATA install directory")
125-
set(LIBINT2_INSTALL_CMAKEDIR "lib/cmake/libint2"
125+
set(LIBINT2_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/libint2"
126126
CACHE PATH "LIBINT2 CMAKE install directory")
127127

128128

src/lib/libint/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ else()
126126
list(APPEND library_CMAKE_ARGS
127127
-G${CMAKE_GENERATOR}
128128
-DCMAKE_INSTALL_PREFIX=${LIBRARY_INSTALL_STAGE_DIR}
129+
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
130+
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
131+
-DCMAKE_INSTALL_DATADIR=${CMAKE_INSTALL_DATADIR}
129132
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
130133
-DBUILD_TESTING=${BUILD_TESTING}
131134
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
@@ -219,7 +222,7 @@ else()
219222
endif()
220223

221224
# install library from ExternalProject staging area into CMAKE_INSTALL_PREFIX
222-
foreach(_dir include lib share)
225+
foreach(_dir ${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_INSTALL_LIBDIR} ${CMAKE_INSTALL_DATADIR})
223226
install(
224227
DIRECTORY "${LIBRARY_INSTALL_STAGE_DIR}/${_dir}/"
225228
DESTINATION "${_dir}"

0 commit comments

Comments
 (0)