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.

Sign up for GitHub

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

Jump to bottom

Fix the windows build #1501

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Fix the windows build #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@ CMakeSettings.json

# CLion
.idea/
cmake-build-*
6 changes: 5 additions & 1 deletion external/boost/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
# Download and unpack boost at configure time

if (CMAKE_HOST_WIN32)
set(BOOTSTRAP_CMD bootstrap.bat)
if (MSVC)
set(BOOTSTRAP_CMD "bootstrap.bat msvc")
else()
set(BOOTSTRAP_CMD "bootstrap.bat")
endif(MSVC)
set(B2_CMD b2.exe)
else()
# Reset the CXX (path to compiler) before running bootstrap since we can cross compile.
Expand Down
4 changes: 2 additions & 2 deletions external/leveldb/CMakeLists-leveldb.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ if(BUILD_SHARED_LIBS)
endif(BUILD_SHARED_LIBS)

add_library(leveldb "")
target_compile_options(leveldb PRIVATE -std=c++11 -Wno-c++11-extensions)
target_compile_options(leveldb PRIVATE -std=c++11)
target_sources(leveldb
PRIVATE
"${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
Expand Down Expand Up @@ -267,7 +267,7 @@ target_link_libraries(leveldb PUBLIC Threads::Threads)
add_executable(leveldbutil
"${PROJECT_SOURCE_DIR}/db/leveldbutil.cc"
)
target_compile_options(leveldbutil PRIVATE -std=c++11 -Wno-c++11-extensions)
target_compile_options(leveldbutil PRIVATE -std=c++11)
target_link_libraries(leveldbutil leveldb)

if(LEVELDB_BUILD_TESTS)
Expand Down
Loading