Permalink
Browse files

Switch catch to single-header version.

Fixes header inclusion drama on platforms without a bazel sandbox
(because we included different headers based on #define-s).

Change-Id: I8d39996edfea1d46e9511084ef6021ad2cfcedc1
  • Loading branch information...
s-kanev committed May 15, 2016
1 parent 4b8d756 commit 1b3cd03c804f0923a65f356f52ed2b8590cd8c97
Showing with 4 additions and 8 deletions.
  1. +3 −7 third_party/catch/BUILD.external
  2. +1 −0 xiosim/BUILD
  3. +0 −1 xiosim/catch_impl.cpp
@@ -1,14 +1,10 @@
licenses(["notice"]) # boost license
CATCH_PATH = "Catch-1.2.1/include"
CATCH_PATH = "Catch-1.2.1"
cc_library(
visibility = ["//visibility:public"],
name = "main",
hdrs = [ CATCH_PATH + "/catch.hpp" ],
srcs = glob([
CATCH_PATH + "/**/*.hpp",
CATCH_PATH + "/**/*.h",
]),
includes = [ CATCH_PATH ],
hdrs = [CATCH_PATH + "/single_include/catch.hpp"],
includes = [CATCH_PATH + "/single_include"],
)
View
@@ -441,6 +441,7 @@ cc_library(
name = "catch_impl",
srcs = ["catch_impl.cpp"],
deps = ["//third_party/catch:main"],
copts = ["-DCATCH_CONFIG_MAIN"],
)
cc_library(
View
@@ -1,2 +1 @@
#define CATCH_CONFIG_MAIN
#include "catch.hpp"

0 comments on commit 1b3cd03

Please sign in to comment.