Permalink
Browse files

[athena-cython] integrate third_party build into cmake

  • Loading branch information...
1 parent 01b17c2 commit 47827a8903e03e6c7c39e084bc7900cf90c32d2f @jermainewang jermainewang committed May 16, 2015
Showing with 196 additions and 2,522 deletions.
  1. +0 −6 .gitignore
  2. +0 −6 BUILDING
  3. +1 −12 CMakeLists.txt
  4. +0 −2,362 DOXYGEN
  5. +1 −0 doc/.gitignore
  6. +1 −1 minerva/CMakeLists.txt
  7. +3 −0 third_party/.gitignore
  8. +45 −0 third_party/CMakeLists.txt
  9. +145 −135 third_party/glog-0.3.3/configure
View
@@ -27,9 +27,6 @@ lib
tags
vendor
-# Freeze third party dependencies
-third_party
-
# Cmake files
cmake_install.cmake
CMakeCache.txt
@@ -55,8 +52,5 @@ Vagrantfile
# configure file
configure.in
-# doc files
-doc/_build
-
# data files
*.mat
View
@@ -1,6 +0,0 @@
-To build Minerva so that it finds the locally installed dependencies, use the
-following command:
-
- ./configure -DCMAKE_PREFIX_PATH=`pwd`/deps
-
-
View
@@ -72,19 +72,8 @@ endif()
set(THIRD_PARTY_ROOT "${Minerva_SOURCE_DIR}/third_party")
set(THIRD_PARTY_INCLUDE "${Minerva_SOURCE_DIR}/third_party/include")
set(THIRD_PARTY_LIB "${Minerva_SOURCE_DIR}/third_party/lib")
-include(ExternalProject)
-# dmlc-core
-set(DMLC_CORE_CONFIGURE_CMD
- ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/make/config.mk <SOURCE_DIR>)
-
-ExternalProject_Add(dmlc-core
- PREFIX ${THIRD_PARTY_ROOT}/dmlc
- GIT_REPOSITORY "https://github.com/dmlc/dmlc-core.git"
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${DMLC_CORE_CONFIGURE_CMD})
-
+add_subdirectory(third_party)
include_directories(SYSTEM ${THIRD_PARTY_INCLUDE})
-set(CORE_DEPS dmlc-core)
############################################# macros
Oops, something went wrong.

0 comments on commit 47827a8

Please sign in to comment.