[arrayfire] 82/284: threads library is now a submodule in cpu backend

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Sun Feb 7 18:59:21 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit 8cc9c9cd4f4b23a0ddb58e3feee55c3eccd0b6be
Author: pradeep <pradeep at arrayfire.com>
Date:   Thu Dec 17 18:04:12 2015 -0500

    threads library is now a submodule in cpu backend
---
 .gitmodules                    |  3 +++
 src/backend/cpu/CMakeLists.txt | 15 +--------------
 src/backend/cpu/threads        |  1 +
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 395881a..1d89315 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "test/gtest"]
 	path = test/gtest
 	url = https://chromium.googlesource.com/external/googletest
+[submodule "src/backend/cpu/threads"]
+	path = src/backend/cpu/threads
+	url = git at github.com:alltheflops/threads.git
diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt
index 57cf3df..62f0b3a 100644
--- a/src/backend/cpu/CMakeLists.txt
+++ b/src/backend/cpu/CMakeLists.txt
@@ -47,24 +47,12 @@ IF(NOT UNIX)
     ADD_DEFINITIONS(-DAFDLL)
 ENDIF()
 
-INCLUDE(ExternalProject)
-ExternalProject_Add(
-    threads
-    PREFIX ${CMAKE_BINARY_DIR}/third_party/threads
-    GIT_REPOSITORY https://github.com/alltheflops/threads.git
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
-                    <SOURCE_DIR>/threads ${CMAKE_BINARY_DIR}/third_party/threads
-    LOG_DOWNLOAD ON
-    LOG_INSTALL ON
-    )
 INCLUDE_DIRECTORIES(
     ${CMAKE_INCLUDE_PATH}
     "${CMAKE_SOURCE_DIR}/src/backend/cpu"
+    "${CMAKE_SOURCE_DIR}/src/backend/cpu/threads"
     ${FFTW_INCLUDES}
     ${CBLAS_INCLUDE_DIR}
-    ${CMAKE_BINARY_DIR}/third_party/threads/src/threads
     )
 
 IF(LAPACK_FOUND)
@@ -164,7 +152,6 @@ TARGET_LINK_LIBRARIES(afcpu
                             PRIVATE ${CBLAS_LIBRARIES}
                             PRIVATE ${FFTW_LIBRARIES})
 
-ADD_DEPENDENCIES(afcpu threads)
 IF(FORGE_FOUND AND NOT USE_SYSTEM_FORGE)
   ADD_DEPENDENCIES(afcpu forge)
 ENDIF()
diff --git a/src/backend/cpu/threads b/src/backend/cpu/threads
new file mode 160000
index 0000000..5e778ce
--- /dev/null
+++ b/src/backend/cpu/threads
@@ -0,0 +1 @@
+Subproject commit 5e778ce0a7f0f80af9d32ea3569df3dbec834f59

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git



More information about the debian-science-commits mailing list