mirror of https://github.com/microsoft/vcpkg.git
[sqlite3][nss] fix missing -lm (#51591)
Co-authored-by: Javier Matos Denizac <javiermat@microsoft.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
This commit is contained in:
parent
d09977e631
commit
d29e8309d1
|
|
@ -190,16 +190,16 @@ foreach(out_var IN ITEMS NSPR_LIBS_RELEASE NSPR_LIBS_DEBUG SQLITE_LIBS_RELEASE S
|
|||
cygpath_u(dir "${dir}")
|
||||
endif()
|
||||
if(VCPKG_DETECTED_MSVC)
|
||||
list(APPEND ${out_var} "-LIBPATH:${dir}")
|
||||
string(APPEND ${out_var} " -LIBPATH:${dir}")
|
||||
else()
|
||||
list(APPEND ${out_var} "-L${dir}")
|
||||
string(APPEND ${out_var} " -L${dir}")
|
||||
endif()
|
||||
elseif(item MATCHES "^-l(.*)")
|
||||
list(APPEND ${out_var} "${item}")
|
||||
string(APPEND ${out_var} " ${item}")
|
||||
endif()
|
||||
endforeach()
|
||||
string(STRIP "${${out_var}}" ${out_var})
|
||||
endforeach()
|
||||
|
||||
# configuring and building in an autotools-like environment, but using gyp-next and ninja
|
||||
vcpkg_make_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "nss",
|
||||
"version": "3.113.1",
|
||||
"port-version": 2,
|
||||
"port-version": 3,
|
||||
"description": "Network Security Services from Mozilla",
|
||||
"homepage": "https://ftp.mozilla.org/pub/security/nss/releases/",
|
||||
"license": "MPL-2.0",
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ if (NOT WIN32)
|
|||
endforeach()
|
||||
|
||||
if(SQLITE_ENABLE_FTS5 OR SQLITE_ENABLE_MATH_FUNCTIONS)
|
||||
find_library(HAVE_LIBM m)
|
||||
find_library(HAVE_LIBM m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
|
||||
if(HAVE_LIBM)
|
||||
target_link_libraries(sqlite3 PRIVATE m)
|
||||
string(APPEND PKGCONFIG_LIBS_PRIVATE " -lm")
|
||||
|
|
@ -66,7 +66,7 @@ if(NOT SQLITE3_SKIP_TOOLS)
|
|||
target_compile_definitions(sqlite3-bin PRIVATE SQLITE_HAVE_ZLIB)
|
||||
endif()
|
||||
|
||||
find_library(HAVE_LIBM m)
|
||||
find_library(HAVE_LIBM m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES})
|
||||
if(HAVE_LIBM)
|
||||
target_link_libraries(sqlite3-bin PRIVATE m)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@ if(SQLite3_FOUND)
|
|||
list(APPEND z_vcpkg_sqlite3_libraries ${CMAKE_DL_LIBS})
|
||||
list(APPEND z_vcpkg_sqlite3_link_libs ${CMAKE_DL_LIBS})
|
||||
if("@SQLITE_ENABLE_FTS5@" OR "@SQLITE_ENABLE_MATH_FUNCTIONS@")
|
||||
find_library(z_vcpkg_sqlite3_have_libm m)
|
||||
if(z_vcpkg_sqlite3_have_libm)
|
||||
if("@HAVE_LIBM@")
|
||||
list(APPEND z_vcpkg_sqlite3_libraries m)
|
||||
list(APPEND z_vcpkg_sqlite3_link_libs $<LINK_ONLY:m>)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "sqlite3",
|
||||
"version": "3.53.1",
|
||||
"port-version": 1,
|
||||
"description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.",
|
||||
"homepage": "https://sqlite.org/",
|
||||
"license": "blessing",
|
||||
|
|
|
|||
|
|
@ -7078,7 +7078,7 @@
|
|||
},
|
||||
"nss": {
|
||||
"baseline": "3.113.1",
|
||||
"port-version": 2
|
||||
"port-version": 3
|
||||
},
|
||||
"nsync": {
|
||||
"baseline": "1.30.0",
|
||||
|
|
@ -9574,7 +9574,7 @@
|
|||
},
|
||||
"sqlite3": {
|
||||
"baseline": "3.53.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"sqlitecpp": {
|
||||
"baseline": "3.3.3",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "480900face8da81dc4bc0c836ac286769424b840",
|
||||
"version": "3.113.1",
|
||||
"port-version": 3
|
||||
},
|
||||
{
|
||||
"git-tree": "c94c7dd02d00ea7fe53424fc4efe66302ad60315",
|
||||
"version": "3.113.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2026ad457a41f41b28699ef66ee4f9431d4a86f1",
|
||||
"version": "3.53.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "6000b6c43c7b94da3d598e79803ca4209f326ff0",
|
||||
"version": "3.53.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue