Sophie

Sophie

distrib > Mageia > 8 > x86_64 > by-pkgid > 7e2e09e6dd93d3965bd5930fb89f86a7 > files > 8

codelite-14.0-4.1.mga8.src.rpm

Description: Remove bundled wxsqlite3 from CMakeLists.txt files
Author: James Cowgill <james410@cowgill.org.uk>
Forwarded: not-needed
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff -Nru a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2018-02-24 20:01:41.000000000 +0100
+++ b/CMakeLists.txt	2018-04-24 05:19:47.683163808 +0200
@@ -573,7 +573,6 @@
     add_subdirectory(sqlite3)
 endif()
 
-add_subdirectory(sdk/wxsqlite3)
 add_subdirectory(sdk/wxshapeframework)
 add_subdirectory(sdk/databaselayer)
 add_subdirectory(CodeLite)
@@ -666,9 +665,7 @@
     add_dependencies(wxsqlite3 sqlite3lib)
 endif()
 
-add_dependencies(databaselayersqlite wxsqlite3)
-add_dependencies(wxshapeframework wxsqlite3)
-add_dependencies(libcodelite wxshapeframework databaselayersqlite wxsqlite3)
+add_dependencies(libcodelite wxshapeframework databaselayersqlite)
 add_dependencies(plugin libcodelite)
 
 if(NOT SDK_ONLY)
diff -Nru a/CodeLite/CMakeLists.txt b/CodeLite/CMakeLists.txt
--- a/CodeLite/CMakeLists.txt	2018-02-24 20:01:41.000000000 +0100
+++ b/CodeLite/CMakeLists.txt	2018-04-24 05:21:11.974297793 +0200
@@ -8,6 +8,10 @@ project(libcodelite)
 # It was noticed that when using MinGW gcc it is essential that 'core' is mentioned before 'base'.
 find_package(wxWidgets COMPONENTS std stc REQUIRED)
 
+# wxSQLite3
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(WXSQLITE REQUIRED wxsqlite3)
+
 # wxWidgets include (this will do all the magic to configure everything)
 include( "${wxWidgets_USE_FILE}" )
 
@@ -116,7 +116,7 @@ if (UNIX AND NOT APPLE )
                          ${wxWidgets_LIBRARIES} 
                          -L"${CL_LIBPATH}" 
                          ${SQLITE3_LIBRARY}
-                         wxsqlite3 
+                         ${WXSQLITE_LIBRARIES}
                          ${LIBSSH_LIB} 
                          ${ADDITIONAL_LIBRARIES}
                          ${LIBUCHARDET_LIB})

diff --git a/wxcrafter/CMakeLists.txt b/wxcrafter/CMakeLists.txt
index e3e7605..2c8df09 100644
--- a/wxcrafter/CMakeLists.txt
+++ b/wxcrafter/CMakeLists.txt
@@ -43,7 +43,6 @@ include( "${wxWidgets_USE_FILE}" )
 
 # Include paths
 include_directories("${CL_SRC_ROOT}/Plugin" 
-                    "${CL_SRC_ROOT}/sdk/wxsqlite3/include" 
                     "${CL_SRC_ROOT}/CodeLite" 
                     "${CL_SRC_ROOT}/PCH" 
                     "${CL_SRC_ROOT}/Interfaces")
@@ -105,7 +104,7 @@ if ( NOT WXC_APP )
 
 if (NOT OFFICIAL_CL_BUILD)
     target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} 
-                          wxsqlite3 
+                          ${WXSQLITE_LIBRARIES} 
                           ${SQLITE3_LIBRARY}
                           libcodelite 
                           plugin)
@@ -115,7 +114,7 @@ endif(NOT OFFICIAL_CL_BUILD)
 
 else() 
     target_link_libraries(${PLUGIN_NAME} ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES}
-                          wxsqlite3 
+                          ${WXSQLITE_LIBRARIES} 
                           libcodelite 
                           plugin
                           -lutil)