diff --git a/backend/wbprivate/CMakeLists.txt b/backend/wbprivate/CMakeLists.txt index cd2e672..61ba73e 100644 --- a/backend/wbprivate/CMakeLists.txt +++ b/backend/wbprivate/CMakeLists.txt @@ -97,6 +97,8 @@ target_link_libraries(wbprivate mforms wbpublic::wbpublic Rapidjson::Rapidjson + ${PCRE_LIBRARIES} + ${LIBZIP_LIBRARIES} ) add_library(wbprivate_Iface INTERFACE) diff --git a/build/cmake/Modules/FindMySQLCppConn.cmake b/build/cmake/Modules/FindMySQLCppConn.cmake index 3ccd123..75d64c3 100644 --- a/build/cmake/Modules/FindMySQLCppConn.cmake +++ b/build/cmake/Modules/FindMySQLCppConn.cmake @@ -27,7 +27,7 @@ if (MySQLCppConn_INCLUDE_DIRS AND MySQLCppConn_LIBRARIES) set(MySQLCppConn_FIND_QUIETLY TRUE) endif () -find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS /usr/include /usr/local/include) +find_path(MySQLCppConn_INCLUDE_DIR NAMES mysql_connection.h PATHS /usr/include /usr/include/jdbc /usr/local/include /usr/local/include/jdbc) SET(MySQLCppConn_NAMES mysqlcppconn) diff --git a/library/mysql.canvas/src/CMakeLists.txt b/library/mysql.canvas/src/CMakeLists.txt index 7cafe41..17deadc 100644 --- a/library/mysql.canvas/src/CMakeLists.txt +++ b/library/mysql.canvas/src/CMakeLists.txt @@ -94,6 +94,7 @@ target_link_libraries(mdcanvasgtk PRIVATE mdcanvas wbbase + ${OPENGL_LIBRARIES} ) if(BUILD_FOR_GCOV)