Skip to content

Commit

Permalink
PR feedback: Move debugrt under debugger.
Browse files Browse the repository at this point in the history
  • Loading branch information
anakrish committed Jul 1, 2019
1 parent e2238f1 commit fc8de5f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ enable_testing()
include(add_enclave_test)

# Recurse through subdirectories
add_subdirectory(debugrt)
add_subdirectory(host)
add_subdirectory(include)
add_subdirectory(tests)
Expand All @@ -210,10 +209,11 @@ if (BUILD_ENCLAVES)
add_subdirectory(syscall)
endif()

if (OE_SGX)
add_subdirectory(debugger)
endif()

if (UNIX)
if (OE_SGX)
add_subdirectory(debugger)
endif()
add_subdirectory(docs/refman)
add_subdirectory(pkgconfig)
add_subdirectory(samples)
Expand Down
27 changes: 16 additions & 11 deletions debugger/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

add_subdirectory(ptraceLib)
add_subdirectory(pythonExtension)
if (UNIX)
add_subdirectory(ptraceLib)
add_subdirectory(pythonExtension)

# Copy oegdb to build/output/bin so that it can be used
# for debugging enclaves built as part of OE SDK.
file(COPY oegdb DESTINATION ${OE_BINDIR})
# Copy oegdb to build/output/bin so that it can be used
# for debugging enclaves built as part of OE SDK.
file(COPY oegdb DESTINATION ${OE_BINDIR})

install(PROGRAMS oegdb DESTINATION ${CMAKE_INSTALL_BINDIR})
install(PROGRAMS oegdb DESTINATION ${CMAKE_INSTALL_BINDIR})

# Copy and install a script with the deprecated name that emits a
# warning about the rename and then replaces itself with `oegdb`.
# TODO: Remove this in v0.7.0.
file(COPY oe-gdb DESTINATION ${OE_BINDIR})
# Copy and install a script with the deprecated name that emits a
# warning about the rename and then replaces itself with `oegdb`.
# TODO: Remove this in v0.7.0.
file(COPY oe-gdb DESTINATION ${OE_BINDIR})

install(PROGRAMS oe-gdb DESTINATION ${CMAKE_INSTALL_BINDIR})
install(PROGRAMS oe-gdb DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

#debugrt is built on all SGX platforms
add_subdirectory(debugrt)
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit fc8de5f

Please sign in to comment.