Merge pull request #10666 from reyoung/feature/fix_ninja_build

reyoung · web-flow · commit 7ebb24692a69 · 2018-05-16T17:43:53.000+08:00
Polish cmake
diff --git a/cmake/external/snappy.cmake b/cmake/external/snappy.cmake
@@ -47,8 +47,6 @@ ExternalProject_Add(
                      -DCMAKE_INSTALL_LIBDIR:PATH=${SNAPPY_INSTALL_DIR}/lib
                      -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON
                      -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
-    BUILD_COMMAND   make -j8
-    INSTALL_COMMAND make install
 )
 
 add_library(snappy STATIC IMPORTED GLOBAL)
diff --git a/cmake/external/snappystream.cmake b/cmake/external/snappystream.cmake
@@ -46,8 +46,6 @@ ExternalProject_Add(
                         -DCMAKE_INSTALL_PREFIX:PATH=${SNAPPYSTREAM_INSTALL_DIR}
                         -DCMAKE_INSTALL_LIBDIR:PATH=${SNAPPYSTREAM_INSTALL_DIR}/lib
                         -DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}
-        BUILD_COMMAND   make -j8
-        INSTALL_COMMAND make install
         DEPENDS snappy
 )
 
diff --git a/paddle/fluid/platform/CMakeLists.txt b/paddle/fluid/platform/CMakeLists.txt
@@ -1,4 +1,4 @@
-proto_library(profiler_proto SRCS profiler.proto)
+proto_library(profiler_proto SRCS profiler.proto DEPS framework_proto)
 py_proto_compile(profiler_py_proto SRCS profiler.proto)
 
 add_custom_target(profiler_py_proto_init ALL COMMAND ${CMAKE_COMMAND} -E touch __init__.py)

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,6 @@ ExternalProject_Add(`
`47`	`47`	`-DCMAKE_INSTALL_LIBDIR:PATH=${SNAPPY_INSTALL_DIR}/lib`
`48`	`48`	`-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON`
`49`	`49`	`-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}`
`50`		`- BUILD_COMMAND make -j8`
`51`		`- INSTALL_COMMAND make install`
`52`	`50`	`)`
`53`	`51`
`54`	`52`	`add_library(snappy STATIC IMPORTED GLOBAL)`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ ExternalProject_Add(`
`46`	`46`	`-DCMAKE_INSTALL_PREFIX:PATH=${SNAPPYSTREAM_INSTALL_DIR}`
`47`	`47`	`-DCMAKE_INSTALL_LIBDIR:PATH=${SNAPPYSTREAM_INSTALL_DIR}/lib`
`48`	`48`	`-DCMAKE_BUILD_TYPE:STRING=${THIRD_PARTY_BUILD_TYPE}`
`49`		`- BUILD_COMMAND make -j8`
`50`		`- INSTALL_COMMAND make install`
`51`	`49`	`DEPENDS snappy`
`52`	`50`	`)`
`53`	`51`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-proto_library(profiler_proto SRCS profiler.proto)`
	`1`	`+proto_library(profiler_proto SRCS profiler.proto DEPS framework_proto)`
`2`	`2`	`py_proto_compile(profiler_py_proto SRCS profiler.proto)`
`3`	`3`
`4`	`4`	`add_custom_target(profiler_py_proto_init ALL COMMAND ${CMAKE_COMMAND} -E touch __init__.py)`