diff --git a/cmake/util.cmake b/cmake/util.cmake
index 38366373c6dbcc1d05c359484ae73ace1bbc59be..03734e7839d74d2951a2395168c577178bdbd0a8 100644
--- a/cmake/util.cmake
+++ b/cmake/util.cmake
@@ -96,6 +96,7 @@ function(link_paddle_exe TARGET_NAME)
     target_circle_link_libraries(${TARGET_NAME}
         ARCHIVE_START
         paddle_gserver
+        paddle_function
         ${METRIC_LIBS}
         ARCHIVE_END
         paddle_pserver
diff --git a/paddle/CMakeLists.txt b/paddle/CMakeLists.txt
index fb3af8ea92feed96a9669bfb29ef7353a256c308..2daea052b01adc87f42e15cdcfec92301b7edae9 100644
--- a/paddle/CMakeLists.txt
+++ b/paddle/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(cuda)
+add_subdirectory(function)
 add_subdirectory(utils)
 add_subdirectory(math)
 add_subdirectory(parameter)
diff --git a/paddle/function/CMakeLists.txt b/paddle/function/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8fad0e3ebdfb2c57c607a9d2b2c858ef5fb58a31
--- /dev/null
+++ b/paddle/function/CMakeLists.txt
@@ -0,0 +1,12 @@
+file(GLOB FUNCTION_HEADERS . *.h)
+
+if(NOT WITH_GPU)
+    file(GLOB FUNCTION_SOURCES . *.cpp)
+    add_library(paddle_function STATIC ${FUNCTION_SOURCES})
+else()
+    file(GLOB FUNCTION_SOURCES . *.cpp *.cu)
+    cuda_add_library(paddle_function ${FUNCTION_SOURCES})
+endif()
+
+add_style_check_target(paddle_function ${FUNCTION_SOURCES})
+add_style_check_target(paddle_function ${FUNCTION_HEADERS})
diff --git a/paddle/function/cross_map_normal_op.cpp b/paddle/function/cross_map_normal_op.cpp
index 8547978c991603cb145107b5a3b529e7fe741d6c..0391a58d89f4afe878edbc6268cb1018f6582f89 100644
--- a/paddle/function/cross_map_normal_op.cpp
+++ b/paddle/function/cross_map_normal_op.cpp
@@ -215,8 +215,10 @@ private:
 };
 
 REGISTER_TYPED_FUNC(CrossMapNormal, CPU, CrossMapNormalFunc);
-REGISTER_TYPED_FUNC(CrossMapNormal, GPU, CrossMapNormalFunc);
 REGISTER_TYPED_FUNC(CrossMapNormalGrad, CPU, CrossMapNormalGradFunc);
+#ifndef PADDLE_ONLY_CPU
+REGISTER_TYPED_FUNC(CrossMapNormal, GPU, CrossMapNormalFunc);
 REGISTER_TYPED_FUNC(CrossMapNormalGrad, GPU, CrossMapNormalGradFunc);
+#endif
 
 }  // namespace paddle
diff --git a/paddle/gserver/CMakeLists.txt b/paddle/gserver/CMakeLists.txt
index a066f80c221ee8ab4383ee6463f7b111984b58ff..4f92150ec84d637c5b75cba09d7e98501a5a5f5d 100644
--- a/paddle/gserver/CMakeLists.txt
+++ b/paddle/gserver/CMakeLists.txt
@@ -27,16 +27,12 @@ if(NOT WITH_GPU)
     list(REMOVE_ITEM GSERVER_HEADER
         layers/CudnnConvLayer.h
         layers/CudnnPoolLayer.h
-        layers/CudnnBatchNormLayer.h
-        layers/NormProjectionLayer.h
-        layers/NormLayer.h)
+        layers/CudnnBatchNormLayer.h)
 
     list(REMOVE_ITEM GSERVER_SOURCES
         layers/CudnnConvLayer.cpp
         layers/CudnnPoolLayer.cpp
-        layers/CudnnBatchNormLayer.cpp
-        layers/NormProjectionLayer.cpp
-        layers/NormLayer.cpp)
+        layers/CudnnBatchNormLayer.cpp)
     compile_cu_as_cpp(layers/LstmCompute.cu)
     compile_cu_as_cpp(layers/GruCompute.cu)
 endif()