mirror of
https://abf.rosa.ru/djam/codelite.git
synced 2025-02-23 14:42:55 +00:00
50 lines
3.8 KiB
Diff
50 lines
3.8 KiB
Diff
diff -urN codelite-6.0.1/DatabaseExplorer/CMakeLists.txt codelite-6.0.1-patched/DatabaseExplorer/CMakeLists.txt
|
|
--- codelite-6.0.1/DatabaseExplorer/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
|
+++ codelite-6.0.1-patched/DatabaseExplorer/CMakeLists.txt 2014-08-07 13:56:33.727198669 +1100
|
|
@@ -78,7 +78,7 @@
|
|
if (GTK3_FOUND)
|
|
target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${GTK3_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework)
|
|
else()
|
|
- target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${GTK2_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework)
|
|
+ target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${GTK2_LIBRARIES} ${LIBMYSQLCLIENT} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -lplugin -ldatabaselayersqlite -lwxshapeframework -lgtk-x11-2.0)
|
|
endif()
|
|
# Make sure that the plugin will not start build before 'plugin.so' is ready
|
|
add_dependencies(${PLUGIN_NAME} plugin)
|
|
diff -urN codelite-6.0.1/Plugin/CMakeLists.txt codelite-6.0.1-patched/Plugin/CMakeLists.txt
|
|
--- codelite-6.0.1/Plugin/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
|
+++ codelite-6.0.1-patched/Plugin/CMakeLists.txt 2014-08-07 13:57:36.570197916 +1100
|
|
@@ -80,11 +80,11 @@
|
|
# Define the output
|
|
add_library(plugin SHARED ${SRCS})
|
|
if(GTK2_FOUND)
|
|
- target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK2_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
|
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK2_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
|
elseif (GTK3_FOUND)
|
|
- target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK3_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
|
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${GTK3_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
|
else()
|
|
- target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite)
|
|
+ target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite -ldl -lutil)
|
|
endif()
|
|
|
|
install(TARGETS plugin DESTINATION ${PLUGINS_DIR})
|
|
diff -urN codelite-6.0.1/sdk/databaselayer/CMakeLists.txt codelite-6.0.1-patched/sdk/databaselayer/CMakeLists.txt
|
|
--- codelite-6.0.1/sdk/databaselayer/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
|
+++ codelite-6.0.1-patched/sdk/databaselayer/CMakeLists.txt 2014-08-07 13:55:22.091199527 +1100
|
|
@@ -49,5 +49,5 @@
|
|
|
|
# Define the output
|
|
add_library(databaselayersqlite SHARED ${SRCS} ${MYSQL_SRCS})
|
|
-target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES})
|
|
+target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -ldl)
|
|
install(TARGETS databaselayersqlite DESTINATION ${PLUGINS_DIR})
|
|
diff -urN codelite-6.0.1/sdk/wxsqlite3/CMakeLists.txt codelite-6.0.1-patched/sdk/wxsqlite3/CMakeLists.txt
|
|
--- codelite-6.0.1/sdk/wxsqlite3/CMakeLists.txt 2014-06-04 15:10:09.000000000 +1100
|
|
+++ codelite-6.0.1-patched/sdk/wxsqlite3/CMakeLists.txt 2014-08-07 13:55:22.091199527 +1100
|
|
@@ -32,5 +32,5 @@
|
|
|
|
# Define the output
|
|
add_library(wxsqlite3 SHARED ${SRCS})
|
|
-target_link_libraries(wxsqlite3 ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib)
|
|
+target_link_libraries(wxsqlite3 ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib -ldl)
|
|
install(TARGETS wxsqlite3 DESTINATION ${PLUGINS_DIR})
|