Merge branch 'dev_jiyuan' of https://github.com/Oneflow-Inc/oneflow into dev_jiyuan

CMakeLists.txt

@@ -156,7 +156,3 @@ foreach(cc ${of_all_test})
   add_test(NAME ${test_name} COMMAND ${test_exe_name})
 endforeach()
 
-# SHOW_VARIABLES()
-message(STATUS "Generator: ${CMAKE_GENERATOR}")
-message(STATUS "APPLE: ${APPLE}")
-message(STATUS "WIN32: ${WIN32}")
\ No newline at end of file

cmake/external/gflags.cmake

@@ -11,7 +11,7 @@ set(gflags_TAG 9314597d4b742ed6f95665241345e590a0f5759b)
 if(WIN32)
     set(GFLAGS_BUILD_LIBRARY_DIR ${gflags_LIB_DIR}/${CMAKE_BUILD_TYPE})
     set(GFLAGS_LIBRARY_NAMES gflags_static.lib)
-elseif(APPLE and (${CMAKE_GENERATOR} STREQUAL "Xcode"))
+elseif(APPLE AND ("${CMAKE_GENERATOR}" STREQUAL "Xcode"))
     set(GFLAGS_BUILD_LIBRARY_DIR ${gflags_LIB_DIR}/${CMAKE_BUILD_TYPE})
     set(GFLAGS_LIBRARY_NAMES libgflags.a)
 else()

cmake/external/glog.cmake

@@ -9,7 +9,7 @@ set(glog_TAG da816ea70645e463aa04f9564544939fa327d5a7)
 if(WIN32)
     set(GLOG_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog/src/glog/${CMAKE_BUILD_TYPE})
     set(GLOG_LIBRARY_NAMES glog.lib)
-elseif(APPLE and (${CMAKE_GENERATOR} STREQUAL "Xcode"))
+elseif(APPLE AND ("${CMAKE_GENERATOR}" STREQUAL "Xcode"))
     set(GLOG_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog/src/glog/${CMAKE_BUILD_TYPE})
     set(GLOG_LIBRARY_NAMES libglog.a)
 else()

cmake/external/googletest.cmake

@@ -10,7 +10,7 @@ set(googletest_TAG ec44c6c1675c25b9827aacd08c02433cccde7780)
 if(WIN32)
     set(GOOGLETEST_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/${CMAKE_BUILD_TYPE})
     set(GOOGLETEST_LIBRARY_NAMES gtest.lib)
-elseif(APPLE and (${CMAKE_GENERATOR} STREQUAL "Xcode"))
+elseif(APPLE AND ("${CMAKE_GENERATOR}" STREQUAL "Xcode"))
     set(GOOGLETEST_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/googletest/src/googletest/googletest/${CMAKE_BUILD_TYPE})
     set(GOOGLETEST_LIBRARY_NAMES libgtest.a)
 else()

cmake/external/grpc.cmake

@@ -12,7 +12,7 @@ if(WIN32)
     set(GRPC_LIBRARY_NAMES gpr.lib
       grpc_unsecure.lib
       grpc++_unsecure.lib)
-elseif(APPLE and (${CMAKE_GENERATOR} STREQUAL "Xcode"))
+elseif(APPLE AND ("${CMAKE_GENERATOR}" STREQUAL "Xcode"))
     set(GRPC_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/${CMAKE_BUILD_TYPE})
     set(GRPC_LIBRARY_NAMES libgpr.a
       libgrpc_unsecure.a

cmake/external/protobuf.cmake

@@ -12,8 +12,8 @@ if(WIN32)
     set(PROTOBUF_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/${CMAKE_BUILD_TYPE})
     set(PROTOBUF_LIBRARY_NAMES libprotobufd.lib)
     set(PROTOC_EXECUTABLE_NAME protoc.exe)
-elseif(APPLE and (${CMAKE_GENERATOR} STREQUAL "Xcode"))
-    set(PROTOBUF_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/${CMAKE_BUILD_TYPE})
+elseif(APPLE AND ("${CMAKE_GENERATOR}" STREQUAL "Xcode"))
+    set(PROTOBUF_BUILD_LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf)
     set(PROTOBUF_LIBRARY_NAMES libprotobuf.a)
     set(PROTOC_EXECUTABLE_NAME protoc)
 else()
@@ -75,4 +75,4 @@ add_custom_target(protobuf_create_binary_dir
 
 add_custom_target(protobuf_copy_binary_to_destination
   COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROTOBUF_BUILD_PROTOC_EXECUTABLE} ${PROTOBUF_BINARY_DIR}
-  DEPENDS protobuf_create_binary_dir)
\ No newline at end of file
+  DEPENDS protobuf_create_binary_dir)