From 20a9bb8acbf75036229db25504f9c7cc0f9900e0 Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Tue, 18 Oct 2016 16:01:48 -0400 Subject: added rtree and unlock_notify support to builds of sqlite (odb needs this) --- ports/sqlite3/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 3d5f73a4a..3afc61f4c 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -3,7 +3,11 @@ project(sqlite3 C) include_directories(${SOURCE}) add_library(sqlite3 SHARED ${SOURCE}/sqlite3.c) -target_compile_definitions(sqlite3 PRIVATE $<$:-DSQLITE_DEBUG> "-DSQLITE_API=__declspec(dllexport)") +target_compile_definitions(sqlite3 PRIVATE + $<$:-DSQLITE_DEBUG> "-DSQLITE_API=__declspec(dllexport)" + -DSQLITE_ENABLE_RTREE + -DSQLITE_ENABLE_UNLOCK_NOTIFY + ) if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") target_compile_definitions(sqlite3 PRIVATE -DSQLITE_OS_WINRT=1) endif() -- cgit v1.2.3 From 035952b2424e0115908821489495b0e8e501f83a Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Tue, 18 Oct 2016 16:09:04 -0400 Subject: added static build support to sqlite more static support more sqlite changes finally done with sqlite static --- ports/sqlite3/CMakeLists.txt | 12 ++++++++++-- ports/sqlite3/portfile.cmake | 3 ++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 3afc61f4c..7dc7920e4 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -2,9 +2,17 @@ cmake_minimum_required(VERSION 3.0) project(sqlite3 C) include_directories(${SOURCE}) -add_library(sqlite3 SHARED ${SOURCE}/sqlite3.c) +if(BUILD_SHARED_LIBS) + set(API "-DSQLITE_API=__declspec(dllexport)") +else() + set(API "-DSQLITE_API=extern") +endif() +add_library(sqlite3 ${SOURCE}/sqlite3.c) + + target_compile_definitions(sqlite3 PRIVATE - $<$:-DSQLITE_DEBUG> "-DSQLITE_API=__declspec(dllexport)" + $<$:-DSQLITE_DEBUG> + ${API} -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_UNLOCK_NOTIFY ) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 6918a0788..ac3e6646b 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,3 +1,4 @@ +include(${CMAKE_TRIPLET_FILE}) include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-3150000) vcpkg_download_distfile(ARCHIVE @@ -14,7 +15,7 @@ vcpkg_configure_cmake( OPTIONS -DSOURCE=${SOURCE_PATH} ) - +vcpkg_build_cmake() vcpkg_install_cmake() file(WRITE ${CURRENT_PACKAGES_DIR}/share/sqlite3/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") -- cgit v1.2.3 From 284d50c186dceb788a32e74e486521d7e2bbb1f6 Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Wed, 19 Oct 2016 00:37:33 -0400 Subject: added a config file for sqlite --- ports/sqlite3/CMakeLists.txt | 4 +++- ports/sqlite3/portfile.cmake | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 7dc7920e4..8c1e7e787 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -16,13 +16,15 @@ target_compile_definitions(sqlite3 PRIVATE -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_UNLOCK_NOTIFY ) +target_include_directories(sqlite3 INTERFACE $:include>) if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") target_compile_definitions(sqlite3 PRIVATE -DSQLITE_OS_WINRT=1) endif() -install(TARGETS sqlite3 +install(TARGETS sqlite3 EXPORT sqlite3Config RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) install(FILES ${SOURCE}/sqlite3.h ${SOURCE}/sqlite3ext.h DESTINATION include CONFIGURATIONS Release) +install(EXPORT sqlite3Config DESTINATION share/sqlite3) \ No newline at end of file diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index ac3e6646b..a7999b68c 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -18,5 +18,11 @@ vcpkg_configure_cmake( vcpkg_build_cmake() vcpkg_install_cmake() +file(READ ${CURRENT_PACKAGES_DIR}/debug/share/sqlite3/sqlite3Config-debug.cmake SQLITE3_DEBUG_CONFIG) +string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" SQLITE3_DEBUG_CONFIG "${SQLITE3_DEBUG_CONFIG}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/sqlite3/sqlite3Config-debug.cmake "${SQLITE3_DEBUG_CONFIG}") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(WRITE ${CURRENT_PACKAGES_DIR}/share/sqlite3/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") vcpkg_copy_pdbs() -- cgit v1.2.3 From 2dad2a8b94d5cad2354794eefaffaea3928dec1f Mon Sep 17 00:00:00 2001 From: Charles Barto Date: Wed, 19 Oct 2016 00:42:21 -0400 Subject: fixed typo in sqlite3 config file --- ports/sqlite3/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 8c1e7e787..760684493 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_definitions(sqlite3 PRIVATE -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_UNLOCK_NOTIFY ) -target_include_directories(sqlite3 INTERFACE $:include>) +target_include_directories(sqlite3 INTERFACE $) if(TRIPLET_SYSTEM_NAME MATCHES "WindowsStore") target_compile_definitions(sqlite3 PRIVATE -DSQLITE_OS_WINRT=1) endif() -- cgit v1.2.3