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

mv llvm & rapidjson to 3rd_patry #86

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mv llvm & rapidjson to 3rd_patry #86

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
0 include/llvm/SmallVector.h → 3rd_party/llvm/SmallVector.h
View file
Open in desktop
File renamed without changes.
0 include/llvm/type_traits.h → 3rd_party/llvm/type_traits.h
View file
Open in desktop
File renamed without changes.
0 include/rapidjson/itoa.h → 3rd_party/rapidjson/itoa.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ set(CMAKE_INSTALL_INCLUDE include CACHE PATH "Output directory for header files"
set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")

include_directories(include)
include_directories(3rd_party)

FILE(
GLOB mc_HEADERS
include/*.h
include/hashkit/*.h
include/llvm/*.h
include/rapidjson/*.h
3rd_party/rapidjson/*.h
)
FILE(
GLOB mc_SOURCES
Expand Down
12 changes: 0 additions & 12 deletions misc/.cppcheck-supp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
*:include/llvm/SmallVector.h:55
*:include/llvm/SmallVector.h:88
*:include/llvm/SmallVector.h:134
*:include/llvm/SmallVector.h:162
*:include/llvm/SmallVector.h:214
*:include/llvm/SmallVector.h:515
*:include/llvm/SmallVector.h:516
*:include/llvm/SmallVector.h:715
*:include/llvm/SmallVector.h:718
*:include/llvm/SmallVector.h:726
*:include/llvm/SmallVector.h:735
*:include/llvm/SmallVector.h:796
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this's pr purpose is avoid these suppressions。

unusedFunction:src/Client.cpp:216
unusedFunction:src/c_client.cpp:90
unusedFunction:src/c_client.cpp:92
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

sources = (glob("src/*.cpp") +
["libmc/_client.pyx"])
include_dirs = ["include"]
include_dirs = ["include", "3rd_party"]

COMPILER_FLAGS = ["-fno-strict-aliasing", "-fno-exceptions", "-fno-rtti",
"-Wall", "-DMC_USE_SMALL_VECTOR", "-O3", "-DNDEBUG"]
Expand Down
4 changes: 2 additions & 2 deletions src/golibmc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package golibmc

/*
#cgo CFLAGS: -I ./../include
#cgo CXXFLAGS: -I ./../include
#cgo CFLAGS: -I ./../include -I ./../3rd_party
#cgo CXXFLAGS: -I ./../include -I ./../3rd_party
#include "c_client.h"
*/
import "C"
Expand Down