Skip to content

Commit 66e88d7

Browse files
Fix the windows build (#1501)
Fix the leveldb cmake script Fix boost build on msvc Add Clion default build folders to .gitignore Relates-To: OLPEDGE-2887 Signed-off-by: Mykhailo Kuchma <ext-mykhailo.kuchma@here.com>
1 parent 21f5f8f commit 66e88d7

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,4 @@ CMakeSettings.json
6161

6262
# CLion
6363
.idea/
64+
cmake-build-*

external/boost/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
# Download and unpack boost at configure time
2020

2121
if (CMAKE_HOST_WIN32)
22-
set(BOOTSTRAP_CMD bootstrap.bat)
22+
if (MSVC)
23+
set(BOOTSTRAP_CMD "bootstrap.bat msvc")
24+
else()
25+
set(BOOTSTRAP_CMD "bootstrap.bat")
26+
endif(MSVC)
2327
set(B2_CMD b2.exe)
2428
else()
2529
# Reset the CXX (path to compiler) before running bootstrap since we can cross compile.

external/leveldb/CMakeLists-leveldb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if(BUILD_SHARED_LIBS)
9999
endif(BUILD_SHARED_LIBS)
100100

101101
add_library(leveldb "")
102-
target_compile_options(leveldb PRIVATE -std=c++11 -Wno-c++11-extensions)
102+
target_compile_options(leveldb PRIVATE -std=c++11)
103103
target_sources(leveldb
104104
PRIVATE
105105
"${PROJECT_BINARY_DIR}/${LEVELDB_PORT_CONFIG_DIR}/port_config.h"
@@ -267,7 +267,7 @@ target_link_libraries(leveldb PUBLIC Threads::Threads)
267267
add_executable(leveldbutil
268268
"${PROJECT_SOURCE_DIR}/db/leveldbutil.cc"
269269
)
270-
target_compile_options(leveldbutil PRIVATE -std=c++11 -Wno-c++11-extensions)
270+
target_compile_options(leveldbutil PRIVATE -std=c++11)
271271
target_link_libraries(leveldbutil leveldb)
272272

273273
if(LEVELDB_BUILD_TESTS)

0 commit comments

Comments
 (0)