[cmake] Fix regressions introduced in facebookresearch#600.

Merging PR facebookresearch#600 set the cmake build on fire.
ChrisCummins · Mar 10, 2022 · 8517236 · 8517236
1 parent 46bdb10
commit 8517236
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/compiler_gym/CMakeLists.txt b/compiler_gym/CMakeLists.txt
@@ -23,7 +23,6 @@ cg_py_library(
     compiler_gym::util::util
     compiler_gym::util::flags::flags
     compiler_gym::wrappers::wrappers
-    compiler_gym::envs::llvm::specs
   PUBLIC
 )
 

diff --git a/compiler_gym/envs/llvm/service/CMakeLists.txt b/compiler_gym/envs/llvm/service/CMakeLists.txt
@@ -37,8 +37,6 @@ cg_cc_library(
   ABS_DEPS
     fmt
     magic_enum
-  NON_LIB_DEPS
-    compiler_gym::envs::llvm::service::passes::actions_genfiles
   PUBLIC
 )
 
@@ -183,7 +181,6 @@ cg_cc_library(
     "-DGOOGLE_PROTOBUF_NO_RTTI"
     "-fno-rtti"
   HDRS
-    compiler_gym::envs::llvm::service::passes::10.0.0::headers
     "LlvmSession.h"
   SRCS
     "LlvmSession.cc"
@@ -194,6 +191,7 @@ cg_cc_library(
     ::Cost
     ::Observation
     ::ObservationSpaces
+    compiler_gym::envs::llvm::service::passes::10.0.0::headers
     compiler_gym::service::CompilationSession
     compiler_gym::service::proto::compiler_gym_service_cc_grpc
     compiler_gym::third_party::autophase::InstCount
@@ -215,7 +213,6 @@ cg_cc_library(
     Clog::libclog
   INCLUDES
     ${LLVM_INCLUDE_DIRS}
-    "$<TARGET_PROPERTY:compiler_gym__envs__llvm__service__passes__actions_genfiles,BINARY_DIR>"
   DEFINES
     ${LLVM_DEFINITIONS}
   PUBLIC

diff --git a/tests/pytest_plugins/BUILD b/tests/pytest_plugins/BUILD
@@ -23,7 +23,6 @@ py_library(
     testonly = 1,
     srcs = ["llvm.py"],
     data = [
-        "//compiler_gym/envs/llvm/service/passes:actions_genfiles",
         "//compiler_gym/third_party/cbench:benchmarks_list",
     ],
     deps = [

diff --git a/tests/pytest_plugins/CMakeLists.txt b/tests/pytest_plugins/CMakeLists.txt
@@ -23,7 +23,6 @@ cg_py_library(
   SRCS
     "llvm.py"
   DATA
-    compiler_gym::envs::llvm::service::passes::actions_genfiles
     compiler_gym::third_party::cbench::benchmarks_list
   DEPS
     compiler_gym::envs::llvm::llvm