[pkg-d-commits] [ldc] 04/74: CMake: Exclude new core.sys.netbsd.* modules from non-NetBSD druntime libs
Matthias Klumpp
mak at moszumanska.debian.org
Thu Jul 13 20:54:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
mak pushed a commit to annotated tag v1.3.0-beta2
in repository ldc.
commit e2b3c88eae04a0dc8db431a488693dc0d5b6d4ff
Author: Martin <noone at nowhere.com>
Date: Sun Apr 30 00:27:50 2017 +0200
CMake: Exclude new core.sys.netbsd.* modules from non-NetBSD druntime libs
---
runtime/CMakeLists.txt | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 66f34ef..32795da 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -87,19 +87,20 @@ list(REMOVE_ITEM DRUNTIME_D
${RUNTIME_DIR}/src/rt/trace.d
)
# only include core/sys/ modules matching the platform
-file(GLOB_RECURSE DRUNTIME_D_BIONIC ${RUNTIME_DIR}/src/core/sys/bionic/*.d)
-file(GLOB_RECURSE DRUNTIME_D_DARWIN ${RUNTIME_DIR}/src/core/sys/darwin/*.d)
+file(GLOB_RECURSE DRUNTIME_D_BIONIC ${RUNTIME_DIR}/src/core/sys/bionic/*.d)
+file(GLOB_RECURSE DRUNTIME_D_DARWIN ${RUNTIME_DIR}/src/core/sys/darwin/*.d)
file(GLOB_RECURSE DRUNTIME_D_FREEBSD ${RUNTIME_DIR}/src/core/sys/freebsd/*.d)
-file(GLOB_RECURSE DRUNTIME_D_LINUX ${RUNTIME_DIR}/src/core/sys/linux/*.d)
+file(GLOB_RECURSE DRUNTIME_D_LINUX ${RUNTIME_DIR}/src/core/sys/linux/*.d)
+file(GLOB_RECURSE DRUNTIME_D_NETBSD ${RUNTIME_DIR}/src/core/sys/netbsd/*.d)
file(GLOB_RECURSE DRUNTIME_D_OPENBSD ${RUNTIME_DIR}/src/core/sys/openbsd/*.d)
-file(GLOB_RECURSE DRUNTIME_D_OSX ${RUNTIME_DIR}/src/core/sys/osx/*.d)
-file(GLOB_RECURSE DRUNTIME_D_POSIX ${RUNTIME_DIR}/src/core/sys/posix/*.d)
+file(GLOB_RECURSE DRUNTIME_D_OSX ${RUNTIME_DIR}/src/core/sys/osx/*.d)
+file(GLOB_RECURSE DRUNTIME_D_POSIX ${RUNTIME_DIR}/src/core/sys/posix/*.d)
file(GLOB_RECURSE DRUNTIME_D_SOLARIS ${RUNTIME_DIR}/src/core/sys/solaris/*.d)
file(GLOB_RECURSE DRUNTIME_D_WINDOWS ${RUNTIME_DIR}/src/core/sys/windows/*.d)
list(REMOVE_ITEM DRUNTIME_D
- ${DRUNTIME_D_BIONIC} ${DRUNTIME_D_DARWIN} ${DRUNTIME_D_FREEBSD} ${DRUNTIME_D_LINUX}
- ${DRUNTIME_D_OPENBSD} ${DRUNTIME_D_OSX} ${DRUNTIME_D_POSIX} ${DRUNTIME_D_SOLARIS}
- ${DRUNTIME_D_WINDOWS}
+ ${DRUNTIME_D_BIONIC} ${DRUNTIME_D_DARWIN} ${DRUNTIME_D_FREEBSD} ${DRUNTIME_D_LINUX}
+ ${DRUNTIME_D_NETBSD} ${DRUNTIME_D_OPENBSD} ${DRUNTIME_D_OSX} ${DRUNTIME_D_POSIX}
+ ${DRUNTIME_D_SOLARIS} ${DRUNTIME_D_WINDOWS}
)
if(UNIX)
list(APPEND DRUNTIME_D ${DRUNTIME_D_POSIX})
@@ -111,6 +112,8 @@ if(UNIX)
elseif(${CMAKE_SYSTEM} MATCHES "Linux")
list(APPEND DRUNTIME_D ${DRUNTIME_D_LINUX})
list(APPEND DRUNTIME_D ${DRUNTIME_D_BIONIC})
+ elseif(${CMAKE_SYSTEM} MATCHES "NetBSD")
+ list(APPEND DRUNTIME_D ${DRUNTIME_D_NETBSD})
elseif(${CMAKE_SYSTEM} MATCHES "OpenBSD")
list(APPEND DRUNTIME_D ${DRUNTIME_D_OPENBSD})
elseif(${CMAKE_SYSTEM} MATCHES "SunOS")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git
More information about the pkg-d-commits
mailing list