diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c719d35eced2420b7891dbaf507ba07cd78baf8..b779caefb9a8c9e67953b909e6a61c53a45ac13e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ if(NOT CMAKE_CROSSCOMPILING)
 endif(NOT CMAKE_CROSSCOMPILING)
 find_package(Git REQUIRED)
 find_package(Threads REQUIRED)
+find_package(Boost QUIET)
 
 include(simd)
 
@@ -109,6 +110,7 @@ include_directories("${PROJ_ROOT}")
 include_directories("${PROJ_ROOT}/paddle/cuda/include")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/proto")
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/go/pserver/cclient")
+include_directories(${Boost_INCLUDE_DIRS})
 
 set(EXTERNAL_LIBS
     ${GFLAGS_LIBRARIES}
diff --git a/paddle/CMakeLists.txt b/paddle/CMakeLists.txt
index 0cddb95244fcfbca77be9bae4a27a372265c70f9..979b68e8272184d80b45cd50a1b606cb76056224 100644
--- a/paddle/CMakeLists.txt
+++ b/paddle/CMakeLists.txt
@@ -10,17 +10,9 @@ add_subdirectory(trainer)
 add_subdirectory(scripts)
 add_subdirectory(optimizer)
 add_subdirectory(strings)
-add_subdirectory(memory)
-
-# Do not build go directory until go cmake is working smoothly.
-# if(CMAKE_Go_COMPILER)
-#   add_subdirectory(go)
-# endif()
-
-find_package(Boost QUIET)
 
 if(Boost_FOUND)
-  include_directories(${Boost_INCLUDE_DIRS})
+  add_subdirectory(memory)
   add_subdirectory(platform)
   add_subdirectory(framework)
 endif()
diff --git a/paddle/memory/CMakeLists.txt b/paddle/memory/CMakeLists.txt
index 86625124967d7dfb392f5a8e74e591cb2955385f..e74ce75c9398d7a5662262c23626fd984863a68c 100644
--- a/paddle/memory/CMakeLists.txt
+++ b/paddle/memory/CMakeLists.txt
@@ -3,5 +3,5 @@ add_subdirectory(detail)
 if(${WITH_GPU})
   nv_library(memory SRCS memory.cc)
 else(${WITH_GPU})
-  cc_library(memory SRCS memroy.cc)
+  cc_library(memory SRCS memory.cc)
 endif(${WITH_GPU})