From d8c8f419f974a9d02bddd937330e8201a3a2a699 Mon Sep 17 00:00:00 2001
From: liaogang <liaogang@baidu.com>
Date: Sat, 13 May 2017 01:09:24 +0800
Subject: [PATCH] support build majel in subdir

---
 paddle/majel/.gitignore          |  2 ++
 paddle/majel/CMakeLists.txt      | 31 +++++++++++++++++++++++++------
 paddle/majel/test/CMakeLists.txt |  2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 paddle/majel/.gitignore

diff --git a/paddle/majel/.gitignore b/paddle/majel/.gitignore
new file mode 100644
index 00000000000..1f5acdebb56
--- /dev/null
+++ b/paddle/majel/.gitignore
@@ -0,0 +1,2 @@
+build
+third-party
\ No newline at end of file
diff --git a/paddle/majel/CMakeLists.txt b/paddle/majel/CMakeLists.txt
index f1cd4ee9a1d..f3bc984a26a 100644
--- a/paddle/majel/CMakeLists.txt
+++ b/paddle/majel/CMakeLists.txt
@@ -1,3 +1,26 @@
+cmake_minimum_required(VERSION 3.0)
+
+if(GTEST_INCLUDE_DIR AND GTEST_LIBRARIES)
+    message("-- Found gtest (include: ${GTEST_INCLUDE_DIR}, library: ${GTEST_LIBRARIES})")
+else()
+    # find #include <majel/xx.h>
+    get_filename_component(PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
+    include_directories(${PARENT_DIR})
+
+    # find cmake directory modules
+    get_filename_component(PARENT_DIR ${PARENT_DIR} DIRECTORY)
+    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PARENT_DIR}/cmake")
+
+    # enable c++11
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+
+    # enable gtest
+    set(THIRD_PARTY_PATH ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
+    set(WITH_TESTING ON)
+    include(external/gtest)
+endif()
+
+########################### Build Majel #############################
 set(MAJEL_CXX_FILES place.cpp)
 set(MAJEL_CUDA_FILES "")
 
@@ -6,10 +29,6 @@ if(CUDA_FOUND)
 else()
     add_library(majel ${MAJEL_CXX_FILES})
 endif()
+########################### Build Majel #############################
 
-file(GLOB_RECURSE CHECK_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.cpp" "*.h")
-add_style_check_target(majel ${CHECK_FILES})
-
-if(WITH_TESTING)
-    add_subdirectory(test)
-endif()
+add_subdirectory(test)
diff --git a/paddle/majel/test/CMakeLists.txt b/paddle/majel/test/CMakeLists.txt
index a07b1bf5d85..0cc7103b039 100644
--- a/paddle/majel/test/CMakeLists.txt
+++ b/paddle/majel/test/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB_RECURSE ALL_TEST_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.cpp" "*.cc")
 
 add_executable(majel_tests ${ALL_TEST_FILES})
-add_dependencies(majel_tests majel ${external_project_dependencies})
+add_dependencies(majel_tests majel)
 target_link_libraries(majel_tests     
                       ${Boost_LIBRARIES}
                       ${GTEST_LIBRARIES}
-- 
GitLab