Fixes for building with CMake.
Closes #80
COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/80 from google:scotttodd-cmakefixes 350f514fbef2e9df7b95e80a4febe765c7ca618e
PiperOrigin-RevId: 275909288
diff --git a/iree/hal/vulkan/BUILD b/iree/hal/vulkan/BUILD
index b89bda0..56bcb98 100644
--- a/iree/hal/vulkan/BUILD
+++ b/iree/hal/vulkan/BUILD
@@ -354,6 +354,7 @@
":extensibility_util",
":status_util",
":vulkan_device",
+ "//iree/base:memory",
"//iree/base:status",
"//iree/base:tracing",
"//iree/hal:device_info",
diff --git a/iree/hal/vulkan/CMakeLists.txt b/iree/hal/vulkan/CMakeLists.txt
index cbe4265..11dc081 100644
--- a/iree/hal/vulkan/CMakeLists.txt
+++ b/iree/hal/vulkan/CMakeLists.txt
@@ -172,6 +172,7 @@
"extensibility_util.cc"
DEPS
absl::span
+ iree::base::memory
iree::base::status
iree::base::tracing
iree::hal::vulkan::dynamic_symbols
@@ -385,6 +386,7 @@
"vulkan_driver.cc"
DEPS
absl::inlined_vector
+ iree::base::memory
iree::base::status
iree::base::tracing
iree::hal::device_info
diff --git a/iree/hal/vulkan/vulkan_driver.cc b/iree/hal/vulkan/vulkan_driver.cc
index 812d99d..a5238d0 100644
--- a/iree/hal/vulkan/vulkan_driver.cc
+++ b/iree/hal/vulkan/vulkan_driver.cc
@@ -17,6 +17,7 @@
#include <memory>
#include "absl/container/inlined_vector.h"
+#include "iree/base/memory.h"
#include "iree/base/status.h"
#include "iree/base/tracing.h"
#include "iree/hal/device_info.h"
diff --git a/iree/rt/debug/CMakeLists.txt b/iree/rt/debug/CMakeLists.txt
index b5b812b..16a9c92 100644
--- a/iree/rt/debug/CMakeLists.txt
+++ b/iree/rt/debug/CMakeLists.txt
@@ -12,91 +12,104 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# TODO(benvanik): re-enable debugger after refactoring.
+# iree_cc_library(
+# NAME
+# debug_client
+# SRCS
+# "debug_client.cc"
+# HDRS
+# "debug_client.h"
+# DEPS
+# absl::flat_hash_map
+# absl::optional
+# absl::strings
+# absl::span
+# iree::base::source_location
+# iree::base::status
+# iree::schemas
+# iree::rt::debug::debug_client_interface
+# iree::rt::debug::debug_client_tcp
+# PUBLIC
+# )
+
+# iree_cc_library(
+# NAME
+# debug_client_interface
+# HDRS
+# "debug_client.h"
+# DEPS
+# absl::flat_hash_map
+# absl::optional
+# absl::strings
+# absl::span
+# iree::base::status
+# iree::schemas
+# PUBLIC
+# )
+
+# iree_cc_library(
+# NAME
+# debug_client_tcp
+# SRCS
+# "debug_client_tcp.cc"
+# DEPS
+# absl::flat_hash_map
+# absl::memory
+# absl::strings
+# absl::span
+# flatbuffers
+# iree::base::flatbuffer_util
+# iree::base::status
+# iree::schemas
+# iree::rt::debug::debug_client_interface
+# iree::rt::debug::debug_tcp_util
+# iree::rt
+# PUBLIC
+# )
+
+# if(${IREE_ENABLE_DEBUG})
+# iree_cc_library(
+# NAME
+# debug_server
+# HDRS
+# "debug_server.h"
+# DEPS
+# flatbuffers
+# iree::schemas
+# iree::base::status
+# iree::rt::debug::debug_server_interface
+# iree::rt::debug::debug_server_tcp
+# PUBLIC
+# )
+# else()
+# iree_cc_library(
+# NAME
+# debug_server
+# SRCS
+# "debug_server_disabled.cc"
+# HDRS
+# "debug_server.h"
+# DEPS
+# iree::base::status
+# PUBLIC
+# )
+# endif()
+
iree_cc_library(
NAME
- debug_client
+ debug_server
SRCS
- "debug_client.cc"
+ "debug_server_disabled.cc"
HDRS
- "debug_client.h"
+ "debug_server.h"
DEPS
- absl::flat_hash_map
- absl::optional
- absl::strings
- absl::span
- iree::base::source_location
iree::base::status
- iree::schemas
- iree::rt::debug::debug_client_interface
- iree::rt::debug::debug_client_tcp
PUBLIC
)
iree_cc_library(
NAME
- debug_client_interface
- HDRS
- "debug_client.h"
- DEPS
- absl::flat_hash_map
- absl::optional
- absl::strings
- absl::span
- iree::base::status
- iree::schemas
- PUBLIC
-)
-
-iree_cc_library(
- NAME
- debug_client_tcp
- SRCS
- "debug_client_tcp.cc"
- DEPS
- absl::flat_hash_map
- absl::memory
- absl::strings
- absl::span
- flatbuffers
- iree::base::flatbuffer_util
- iree::base::status
- iree::schemas
- iree::rt::debug::debug_client_interface
- iree::rt::debug::debug_tcp_util
- iree::rt
- PUBLIC
-)
-
-if(${IREE_ENABLE_DEBUG})
- iree_cc_library(
- NAME
- debug_server
- HDRS
- "debug_server.h"
- DEPS
- flatbuffers
- iree::schemas
- iree::base::status
- iree::rt::debug::debug_server_interface
- iree::rt::debug::debug_server_tcp
- PUBLIC
- )
-else()
- iree_cc_library(
- NAME
- debug_server
- SRCS
- "debug_server_disabled.cc"
- HDRS
- "debug_server.h"
- DEPS
- iree::base::status
- PUBLIC
- )
-endif()
-
-iree_cc_library(
- NAME
debug_server_interface
HDRS
"debug_server.h"
@@ -105,106 +118,123 @@
PUBLIC
)
-iree_cc_library(
- NAME
- debug_server_tcp
- SRCS
- "debug_server_tcp.cc"
- DEPS
- absl::core_headers
- absl::memory
- absl::synchronization
- flatbuffers
- iree::base::status
- iree::schemas
- iree::rt::debug::debug_server_interface
- iree::rt::debug::debug_service
- iree::rt::debug::debug_tcp_util
-)
-
-if(${IREE_BUILD_DEBUGGER})
- iree_cc_library(
- NAME
- debug_server_flags
- SRCS
- "debug_server_flags.cc"
- HDRS
- "debug_server_flags.h"
- COPTS
- "-DIREE_DEBUG_EMBEDDED_APP_PRESENT=1"
- DEPS
- # TODO(benvanik): EGL/GLESv2
- absl::flags
- absl::strings
- iree::base::memory
- iree::base::status
- iree::rt::debug::debug_server
- iree::tools::debugger::debug_app_embedded
- )
-else()
- iree_cc_library(
- NAME
- debug_server_flags
- SRCS
- "debug_server_flags.cc"
- HDRS
- "debug_server_flags.h"
- DEPS
- absl::flags
- absl::strings
- iree::base::memory
- iree::base::status
- iree::rt::debug::debug_server
- )
-endif()
+# TODO(benvanik): re-enable debugger after refactoring.
+# iree_cc_library(
+# NAME
+# debug_server_tcp
+# SRCS
+# "debug_server_tcp.cc"
+# DEPS
+# absl::core_headers
+# absl::memory
+# absl::synchronization
+# flatbuffers
+# iree::base::status
+# iree::schemas
+# iree::rt::debug::debug_server_interface
+# iree::rt::debug::debug_service
+# iree::rt::debug::debug_tcp_util
+# )
+#
+# if(${IREE_BUILD_DEBUGGER})
+# iree_cc_library(
+# NAME
+# debug_server_flags
+# SRCS
+# "debug_server_flags.cc"
+# HDRS
+# "debug_server_flags.h"
+# COPTS
+# "-DIREE_DEBUG_EMBEDDED_APP_PRESENT=1"
+# DEPS
+# # TODO(benvanik): EGL/GLESv2
+# absl::flags
+# absl::strings
+# iree::base::memory
+# iree::base::status
+# iree::rt::debug::debug_server
+# iree::tools::debugger::debug_app_embedded
+# )
+# else()
+# iree_cc_library(
+# NAME
+# debug_server_flags
+# SRCS
+# "debug_server_flags.cc"
+# HDRS
+# "debug_server_flags.h"
+# DEPS
+# absl::flags
+# absl::strings
+# iree::base::memory
+# iree::base::status
+# iree::rt::debug::debug_server
+# )
+# endif()
iree_cc_library(
NAME
- debug_service
+ debug_server_flags
SRCS
- "debug_service.cc"
+ "debug_server_flags.cc"
HDRS
- "debug_service.h"
+ "debug_server_flags.h"
DEPS
- absl::core_headers
+ absl::flags
absl::strings
- absl::synchronization
- flatbuffers
- iree::base::flatbuffer_util
- iree::base::source_location
+ iree::base::memory
iree::base::status
- iree::schemas
- iree::schemas::reflection_data
- iree::rt
- iree::rt::debug::debug_session
- PUBLIC
+ iree::rt::debug::debug_server
)
-iree_cc_library(
- NAME
- debug_session
- SRCS
- "debug_session.cc"
- HDRS
- "debug_session.h"
- DEPS
- absl::core_headers
- absl::synchronization
- iree::base::source_location
- iree::base::status
- iree::schemas
- iree::rt
- PUBLIC
-)
+# TODO(benvanik): re-enable debugger after refactoring.
+# iree_cc_library(
+# NAME
+# debug_service
+# SRCS
+# "debug_service.cc"
+# HDRS
+# "debug_service.h"
+# DEPS
+# absl::core_headers
+# absl::strings
+# absl::synchronization
+# flatbuffers
+# iree::base::flatbuffer_util
+# iree::base::source_location
+# iree::base::status
+# iree::schemas
+# iree::schemas::reflection_data
+# iree::rt
+# iree::rt::debug::debug_session
+# PUBLIC
+# )
-iree_cc_library(
- NAME
- debug_tcp_util
- HDRS
- "debug_tcp_util.h"
- DEPS
- flatbuffers
- iree::base::status
- iree::schemas
- PUBLIC
-)
+# iree_cc_library(
+# NAME
+# debug_session
+# SRCS
+# "debug_session.cc"
+# HDRS
+# "debug_session.h"
+# DEPS
+# absl::core_headers
+# absl::synchronization
+# iree::base::source_location
+# iree::base::status
+# iree::schemas
+# iree::rt
+# PUBLIC
+# )
+
+# iree_cc_library(
+# NAME
+# debug_tcp_util
+# HDRS
+# "debug_tcp_util.h"
+# DEPS
+# flatbuffers
+# iree::base::status
+# iree::schemas
+# PUBLIC
+# )
