Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update armlinux.diff

  • Loading branch information...
commit a7383b7207db4ae7bc5390fd89c71ea4a85999a8 1 parent c782161
@chenshuo authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 armlinux.diff
View
11 armlinux.diff
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0dad710..6b8cc06 100644
+index 2c8880a..af0d174 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -21,14 +21,14 @@ set(CXX_FLAGS
+@@ -21,7 +21,7 @@ set(CXX_FLAGS
-Wpointer-arith
-Wshadow
-Wwrite-strings
@@ -11,7 +11,8 @@ index 0dad710..6b8cc06 100644
# -MMD
# -std=c++0x
-rdynamic
- )
+@@ -31,7 +31,7 @@ if(CMAKE_BUILD_BITS EQUAL 32)
+ endif()
string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CXX_FLAGS}")
-set(CMAKE_CXX_COMPILER "g++")
@@ -125,7 +126,9 @@ diff --git a/muduo/base/tests/CMakeLists.txt b/muduo/base/tests/CMakeLists.txt
index 2c3f1c4..73d90fd 100644
--- a/muduo/base/tests/CMakeLists.txt
+++ b/muduo/base/tests/CMakeLists.txt
-@@ -1,5 +1,5 @@
+@@ -2,7 +2,7 @@
+ target_link_libraries(asynclogging_test muduo_base)
+
add_executable(atomic_unittest Atomic_unittest.cc)
-# target_link_libraries(atomic_unittest muduo_base)
+target_link_libraries(atomic_unittest muduo_base)

0 comments on commit a7383b7

Please sign in to comment.
Something went wrong with that request. Please try again.