[arrayfire] 44/248: Fixed CMake source bugs for windows platform in unified api sources
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Nov 17 15:53:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.
commit 7e46c54e5d95e9db38dda3e3c6ef87ff9f12b505
Author: Pradeep <pradeep at arrayfire.com>
Date: Tue Sep 8 11:14:18 2015 -0400
Fixed CMake source bugs for windows platform in unified api sources
---
src/api/unified/CMakeLists.txt | 7 +++++++
test/CMakeLists.txt | 6 +++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt
index 1f380e0..ec7388a 100644
--- a/src/api/unified/CMakeLists.txt
+++ b/src/api/unified/CMakeLists.txt
@@ -6,9 +6,14 @@ FILE(GLOB unified_headers
FILE(GLOB unified_sources
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
+SOURCE_GROUP(api\\unified\\Headers FILES ${unified_headers})
+SOURCE_GROUP(api\\unified\\Sources FILES ${unified_sources})
+
FILE(GLOB cpp_sources
"../cpp/*.cpp")
+SOURCE_GROUP(api\\cpp\\Sources FILES ${cpp_sources})
+
FILE(GLOB common_sources
"../c/util.cpp"
"../c/err_common.cpp"
@@ -16,6 +21,8 @@ FILE(GLOB common_sources
"../../backend/dim4.cpp"
)
+SOURCE_GROUP(common FILES ${common_sources})
+
ADD_LIBRARY(af SHARED
${unified_headers}
${unified_sources}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index dc28bf1..0070830 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -117,5 +117,9 @@ ENDIF()
IF(${BUILD_UNIFIED})
MESSAGE(STATUS "TESTS: Unified backends is ON")
- CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" dl)
+ IF(WIN32)
+ CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" "")
+ ELSE()
+ CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" dl)
+ ENDIF()
ENDIF()
--
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