Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cf. https://github.com/azadkuh/sqlite-amalgamation/pull/10 #1

Merged
merged 1 commit into from
Jan 15, 2023
Merged

cf. https://github.com/azadkuh/sqlite-amalgamation/pull/10 #1

merged 1 commit into from
Jan 15, 2023

Conversation

nono303
Copy link

@nono303 nono303 commented Jan 10, 2023

CMakeLists.txt

  • add options SQLITE_HAVE_ZLIB, SQLITE_WIN32_MALLOC, SQLITE_WIN32_HEAP_CREATE, SQLITE_THREADSAFE, SQLITE_OMIT_AUTOINIT
  • fix BUILD_SHARED_LIBS
  • fix project NAME (case)
  • fix find_package (link_libraries & include_directories) on SQLITE_ENABLE_ICU, SQLITE_HAVE_ZLIB
  • add message STATUS on current build

cf. azadkuh#10

@nono303
Copy link
Author

nono303 commented Jan 10, 2023

exemple of cmake result:

cmake 
-G "Ninja"
-DCMAKE_INSTALL_PREFIX=C:\sdk\release\vs17_x64-avx
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DICU_ROOT=C:\sdk\release\vs17_x64-avx
-DBUILD_SHELL=1
-DBUILD_SHELL_STATIC=0
-DSQLITE_RECOMMENDED_OPTIONS=1
-DSQLITE_ENABLE_COLUMN_METADATA=1
-DSQLITE_ENABLE_DBSTAT_VTAB=1
-DSQLITE_ENABLE_FTS3=1
-DSQLITE_ENABLE_FTS4=1
-DSQLITE_ENABLE_FTS5=1
-DSQLITE_ENABLE_GEOPOLY=1
-DSQLITE_ENABLE_ICU=1
-DSQLITE_ENABLE_MATH_FUNCTIONS=1
-DSQLITE_ENABLE_RBU=1
-DSQLITE_ENABLE_RTREE=1
-DSQLITE_ENABLE_STAT4=1
-DSQLITE_HAVE_ZLIB=1
-DSQLITE_OMIT_JSON=0
-DSQLITE_OMIT_DECLTYPE=0
-DSQLITE_OMIT_AUTOINIT=0
-DSQLITE_USE_URI=0
-DSQLITE_THREADSAFE=0
-DSQLITE_WIN32_MALLOC=1
-DSQLITE_WIN32_HEAP_CREATE=1

-- The C compiler identification is MSVC 19.35.32124.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: C:/sdk/softs/vs22/Community/VC/Tools/MSVC/14.35.32124/bin/Hostx64/x64/cl.exe - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- >> static library sqlite3.lib
-- Found the following ICU libraries:
--   uc (required): C:/sdk/release/vs17_x64-avx/lib/icuuc.lib
--   i18n (required): C:/sdk/release/vs17_x64-avx/lib/icuin.lib
-- Found ICU: C:/sdk/release/vs17_x64-avx/include (found version "73.0.1")
-- Found ZLIB: C:/sdk/release/vs17_x64-avx/lib/zlib.lib (found version "1.2.13")
-- >> executable sqlite3.exe
-- Configuring done
-- Generating done
-- Build files have been written to: C:/sdk/build/vs17_x64-avx/sqlite

C:\sdk\softs\ninja.exe -v install
[1/5] C:\sdk\softs\vs22\Community\VC\Tools\MSVC\14.35.32124\bin\Hostx64\x64\cl.exe  /nologo -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_DQS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_ICU -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_STAT4 -DSQLITE_HAVE_ZLIB -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_THREADSAFE=0 -DSQLITE_USE_ALLOCA -DSQLITE_WIN32_HEAP_CREATE -DSQLITE_WIN32_MALLOC -IC:\sdk\release\vs17_x64-avx\include /DWIN32 /D_WINDOWS /w /MD /Zi /Zf /Zi /FS /O2 /GL /MP16 /arch:AVX /w /DNDEBUG /showIncludes /FoCMakeFiles\shell_app.dir\shell.c.obj /FdCMakeFiles\shell_app.dir\ /FS -c C:\sdk\src\sqlite\shell.c
[2/5] C:\sdk\softs\vs22\Community\VC\Tools\MSVC\14.35.32124\bin\Hostx64\x64\cl.exe  /nologo -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_DQS=0 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_GEOPOLY -DSQLITE_ENABLE_ICU -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_RBU -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_STAT4 -DSQLITE_HAVE_ZLIB -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_THREADSAFE=0 -DSQLITE_USE_ALLOCA -DSQLITE_WIN32_HEAP_CREATE -DSQLITE_WIN32_MALLOC -IC:\sdk\release\vs17_x64-avx\include /DWIN32 /D_WINDOWS /w /MD /Zi /Zf /Zi /FS /O2 /GL /MP16 /arch:AVX /w /DNDEBUG /showIncludes /FoCMakeFiles\sqlite3.dir\sqlite3.c.obj /FdCMakeFiles\sqlite3.dir\sqlite3.pdb /FS -c C:\sdk\src\sqlite\sqlite3.c
[3/5] cmd.exe /C "cd . && C:\sdk\softs\vs22\Community\VC\Tools\MSVC\14.35.32124\bin\Hostx64\x64\lib.exe /nologo /LTCG /machine:x64 /out:sqlite3.lib CMakeFiles\sqlite3.dir\sqlite3.c.obj  && cd ."
[4/5] cmd.exe /C "cd . && C:\sdk\softs\cmake\bin\cmake.exe -E vs_link_exe --intdir=CMakeFiles\shell_app.dir --rc=C:\WINDOW~1\10\bin\100226~1.0\x64\rc.exe --mt=C:\WINDOW~1\10\bin\100226~1.0\x64\mt.exe --manifests  -- C:\sdk\softs\vs22\Community\VC\Tools\MSVC\14.35.32124\bin\Hostx64\x64\link.exe /nologo CMakeFiles\shell_app.dir\shell.c.obj  /out:sqlite3.exe /implib:sqlite3.lib /pdb:sqlite3.pdb /version:0.0 /LTCG /machine:x64 /DEBUG /NOLOGO /LTCG /OPT:REF,ICF /subsystem:console  sqlite3.lib  C:\sdk\release\vs17_x64--- Install configuration: "RelWithDebInfo"
-- Installing: C:/sdk/release/vs17_x64-avx/lib/sqlite3.lib
-- Up-to-date: C:/sdk/release/vs17_x64-avx/include/sqlite3.h
-- Installing: C:/sdk/release/vs17_x64-avx/lib/sqlite3.pdb
-- Old export file "C:/sdk/release/vs17_x64-avx/cmake/sqlite3Config.cmake" will be replaced.  Removing files [C:/sdk/release/vs17_x64-avx/cmake/sqlite3Config-relwithdebinfo.cmake].
-- Installing: C:/sdk/release/vs17_x64-avx/cmake/sqlite3Config.cmake
-- Installing: C:/sdk/release/vs17_x64-avx/cmake/sqlite3Config-relwithdebinfo.cmake
-- Installing: C:/sdk/release/vs17_x64-avx/include/sqlite3_config.h
-- Up-to-date: C:/sdk/release/vs17_x64-avx/include/sqlite3/sqlite3ext.h
-- Installing: C:/sdk/release/vs17_x64-avx/bin/sqlite3.exe
-- Installing: C:/sdk/release/vs17_x64-avx/bin/sqlite3.pdb
avx\lib\icuuc.lib  C:\sdk\release\vs17_x64-avx\lib\icuin.lib  C:\sdk\release\vs17_x64-avx\lib\zlib.lib  kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib && cd ."
[4/5] cmd.exe /C "cd /D C:\sdk\build\vs17_x64-avx\sqlite && C:\sdk\softs\cmake\bin\cmake.exe -P cmake_install.cmake"

Copy link
Owner

@rhuijben rhuijben left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the improvements.

@rhuijben rhuijben merged commit 7340617 into rhuijben:master Jan 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants