build fixes
This commit is contained in:
parent
6ba4c0091b
commit
629725e262
@ -70,6 +70,7 @@ duse_libidn2
|
||||
dwith_gflags
|
||||
dwith_liburing
|
||||
dwith_tools
|
||||
dxxh_no_inline_hints
|
||||
dylib
|
||||
endfunction
|
||||
endmacro
|
||||
|
@ -83,12 +83,12 @@ if (LINUX OR MINGW)
|
||||
if (LIBFUSE3 AND NOT MINGW)
|
||||
pkg_check_modules(LIBFUSE3 REQUIRED fuse3>=3.0.0)
|
||||
set(LIBFUSE3_LIBRARIES ${LIBFUSE3})
|
||||
add_definitions(-DFUSE_USE_VERSION=30)
|
||||
set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DFUSE_USE_VERSION=30)
|
||||
endif()
|
||||
|
||||
if(NOT LIBFUSE3_LIBRARIES AND NOT MINGW)
|
||||
pkg_check_modules(LIBFUSE2 REQUIRED fuse>=2.9.0)
|
||||
add_definitions(-DFUSE_USE_VERSION=29)
|
||||
set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DFUSE_USE_VERSION=29)
|
||||
endif()
|
||||
|
||||
if (NOT LIBPTHREAD_LIBRARY)
|
||||
@ -132,8 +132,7 @@ elseif (MACOS)
|
||||
message(FATAL_ERROR "'libpthread' not found")
|
||||
endif()
|
||||
|
||||
set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DBOOST_ASIO_HAS_STD_STRING_VIEW)
|
||||
add_definitions(-DFUSE_USE_VERSION=29)
|
||||
set(REPERTORY_DEFINITIONS ${REPERTORY_DEFINITIONS} -DFUSE_USE_VERSION=29 -DBOOST_ASIO_HAS_STD_STRING_VIEW)
|
||||
|
||||
include_directories(/usr/local/include)
|
||||
find_library(OSXFUSE NO_CACHE NAMES OSXFUSE)
|
||||
|
@ -39,7 +39,7 @@ set (BOOST_COMMON_ARGS
|
||||
)
|
||||
|
||||
if (MINGW)
|
||||
if (NOT WIN32)
|
||||
if (NOT CMAKE_HOST_WIN32)
|
||||
set(BOOST_COMMON_ARGS
|
||||
${BOOST_COMMON_ARGS}
|
||||
--user-config=./user-config.jam
|
||||
@ -77,7 +77,7 @@ if (MINGW)
|
||||
set(BOOST_GCC_VERSION ${CMAKE_CXX_COMPILER_VERSION})
|
||||
string(REPLACE "." ";" BOOST_GCC_VERSION_LIST ${BOOST_GCC_VERSION})
|
||||
list(GET BOOST_GCC_VERSION_LIST 0 BOOST_GCC_MAJOR_VERSION)
|
||||
if(WIN32)
|
||||
if (CMAKE_HOST_WIN32)
|
||||
set(BOOST_LIB_EXTRA "-mgw${BOOST_GCC_MAJOR_VERSION}-mt${DEBUG_EXTRA2}-x64-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}")
|
||||
endif()
|
||||
endif()
|
||||
@ -95,6 +95,6 @@ set(Boost_LIBRARIES
|
||||
)
|
||||
|
||||
add_dependencies(boost_project zlib_project)
|
||||
if (WIN32)
|
||||
if (CMAKE_HOST_WIN32)
|
||||
include_directories(SYSTEM ${EXTERNAL_BUILD_ROOT}/include/boost-${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION})
|
||||
endif()
|
||||
|
@ -38,10 +38,18 @@ if (CMAKE_TOOLCHAIN_FILE)
|
||||
)
|
||||
endif()
|
||||
|
||||
set(CURL_CMAKE_ARGS
|
||||
${CURL_CMAKE_ARGS}
|
||||
-DCURL_USE_OPENSSL=ON
|
||||
)
|
||||
if (MINGW)
|
||||
set(CURL_CMAKE_ARGS
|
||||
${CURL_CMAKE_ARGS}
|
||||
-DCURL_USE_OPENSSL=OFF
|
||||
-DUSE_WIN32_CRYPTO=ON
|
||||
)
|
||||
else()
|
||||
set(CURL_CMAKE_ARGS
|
||||
${CURL_CMAKE_ARGS}
|
||||
-DCURL_USE_OPENSSL=ON
|
||||
)
|
||||
endif()
|
||||
|
||||
ExternalProject_Add(curl_project
|
||||
DOWNLOAD_NO_PROGRESS 1
|
||||
|
@ -8,6 +8,7 @@ endif()
|
||||
|
||||
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
set(ROCKSDB_CMAKE_CXX_FLAGS "${ROCKSDB_CMAKE_CXX_FLAGS} -DXXH_NO_INLINE_HINTS")
|
||||
set(REPERTORY_DEFINITIONS "${REPERTORY_DEFINITIONS} -DXXH_NO_INLINE_HINTS")
|
||||
endif()
|
||||
|
||||
set(ROCKSDB_CMAKE_ARGS
|
||||
|
Loading…
x
Reference in New Issue
Block a user