Fix build issues with PIPEDAL_DISABLE_COPYRIGHT_BUILD
- Wrap notices.txt install in if(NOT PIPEDAL_DISABLE_COPYRIGHT_BUILD) so the install doesn't fail when copyright generation is skipped. - Add explicit install rules for libSQLiteCpp.so.0, libsqlite3.so, and libzip.so.5. These are built from submodules but their own install targets are suppressed (SQLITECPP_INSTALL=OFF, LIBZIP_DO_INSTALL=OFF), so they were never copied to /usr/lib, causing 'cannot open shared object file' errors on distros without these as system packages (e.g. Arch vs Ubuntu).
This commit is contained in:
+16
-1
@@ -74,8 +74,23 @@ install (
|
|||||||
install (
|
install (
|
||||||
DIRECTORY ${VITE_BUILD_DIRECTORY} DESTINATION /etc/pipedal/react
|
DIRECTORY ${VITE_BUILD_DIRECTORY} DESTINATION /etc/pipedal/react
|
||||||
)
|
)
|
||||||
install (FILES ${PROJECT_SOURCE_DIR}/build/src/notices.txt
|
if(NOT PIPEDAL_DISABLE_COPYRIGHT_BUILD)
|
||||||
|
install (FILES ${PROJECT_SOURCE_DIR}/build/src/notices.txt
|
||||||
DESTINATION /etc/pipedal/react/var/)
|
DESTINATION /etc/pipedal/react/var/)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Install SQLiteCpp and libzip shared libraries (their own install targets are disabled)
|
||||||
|
install (
|
||||||
|
FILES
|
||||||
|
${PROJECT_BINARY_DIR}/modules/SQLiteCpp/libSQLiteCpp.so.0
|
||||||
|
${PROJECT_BINARY_DIR}/modules/SQLiteCpp/sqlite3/libsqlite3.so
|
||||||
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
|
||||||
|
)
|
||||||
|
install (
|
||||||
|
FILES
|
||||||
|
${PROJECT_BINARY_DIR}/modules/libzip/lib/libzip.so.5
|
||||||
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
|
||||||
|
)
|
||||||
|
|
||||||
install (
|
install (
|
||||||
DIRECTORY ${PROJECT_SOURCE_DIR}/src/templates
|
DIRECTORY ${PROJECT_SOURCE_DIR}/src/templates
|
||||||
|
|||||||
Reference in New Issue
Block a user