From 25c58a20401ccb444b881784b05c5be9f62b271d Mon Sep 17 00:00:00 2001 From: Dmitri Smirnov Date: Tue, 6 Oct 2015 15:52:09 -0700 Subject: [PATCH] Add shared_linked DEBUG flag, remove port from among the include directories. --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5a33e2a99..446d481bf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ # cd build # 3. Run cmake to generate project files for Windows, add more options to enable required third-party libraries. # See thirdparty.inc for more information. -# cmake -G "Visual Studio 12 Win64" .. -# 4. Then build the project in debug mode (you may want to add /m[:] flag to run msbuild in parallel threads) +# sample command: cmake -G "Visual Studio 12 Win64" -DGFLAGS=1 -DSNAPPY=1 -DJEMALLOC=1 .. +# 4. Then build the project in debug mode (you may want to add /m: flag to run msbuild in parallel threads) # msbuild ALL_BUILD.vcxproj # 5. And release mode (/m[:] is also supported) # msbuild ALL_BUILD.vcxproj /p:Configuration=Release @@ -66,13 +66,13 @@ endif() set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oxt /Zp8 /Gm- /Gy /MD") +set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG") add_definitions(-DWIN32 -DOS_WIN -D_MBCS -DWIN64) include_directories(${PROJECT_SOURCE_DIR}) include_directories(${PROJECT_SOURCE_DIR}/include) -include_directories(${PROJECT_SOURCE_DIR}/port) include_directories(${PROJECT_SOURCE_DIR}/third-party/gtest-1.7.0/fused-src) set(ROCKSDB_LIBS rocksdblib${ARTIFACT_SUFFIX}) @@ -163,6 +163,7 @@ set(SOURCES table/plain_table_reader.cc table/table_properties.cc table/two_level_iterator.cc + tools/dump/db_dump_tool.cc util/arena.cc util/auto_roll_logger.cc util/bloom.cc