Compile sqlite3 in compile step
#137
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cmake now automatically includes LIB_SQLITE_DIR only when needed.
Compiles SQLITE3 in the `cmake --build` compile step, instead of compiling during the `cmake` configure step.
Throws an error if BUILD_SQLITE_LIB=OFF, and SQLite3 cannot be found. BREAKING CHANGE: The minimum `cmake` version to compile EDGESec is now cmake v3.14.0, as it is the first version that adds support for FindSQLite3.cmake
If sqlite3 is compiled/link statically, we avoid installing it into lib/edgesec, as it is not needed.
aloisklink
added
refactor
aloisklink
commented
May 23, 2022
Comment on lines
+49
to
+51
| add_library(supervisor_config INTERFACE) | ||
| set_target_properties(supervisor_config PROPERTIES PUBLIC_HEADER "supervisor_config.h") | ||
| target_link_libraries(supervisor_config INTERFACE SQLite::SQLite3) |
There was a problem hiding this comment.
I added this as an "Interface" aka header-only library, since many files depend on supervisor_config.h, but there is no supervisor_config.c.
That way, if we ever remove "sqlite.h` from this library (or add another depedency), we only need to change it in one place.
| target_include_directories(sqlhook PRIVATE ${LIBSQLITE_INCLUDE_DIR}) | ||
| target_link_libraries(sqlhook PRIVATE domain os SQLite::sqlite) | ||
| target_link_libraries(sqlhook PRIVATE domain os SQLite::SQLite3) |
There was a problem hiding this comment.
I've removed all of the target_include_directories(... LIBSQLITE_INCLUDE_DIR), since they get automatically added when we use target_link_libraries(SQLite::SQLite3)
It looks like the toolchain file only gets run on configure. As this sets our PATH env, we need to redeclare that environment variable for the make and make install commands. It's messy, but it looks like this is the best way of doing it: https://stackoverflow.com/a/62437353/10149169
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Use
ExternalProject_Add()to compile SQLite3, if needed.ExternalProject_Add()automatically downloads, configures, compiles, and runsmake installduring thecmake --buildstep of the parent project.Other stuff:
Throws an error if BUILD_SQLITE_LIB=OFF, and SQLite3 cannot be found.
BREAKING CHANGE: The minimum
cmakeversion to compile EDGESecis now cmake v3.14.0, instead of v3.13.0, as it is the first version that adds support
for FindSQLite3.cmake. This is a 3 year old version that came out in March 2019, so I don't think this should matter much.
Prevents installing sqlite3 if it's a static lib