Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

Commit

Permalink
Fix build for 4.3 (#524)
Browse files Browse the repository at this point in the history
For some reason, the test build is failing on Linux/release. This seems
to fix it. I'm not sure why.
  • Loading branch information
znation authored Apr 12, 2018
1 parent c9cfc82 commit 2c765f9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/unity/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ make_library(unity_core
../extensions/additional_sframe_utilities.cpp
unity_sarray_builder.cpp
unity_sframe_builder.cpp
${VISUALIZATION_SOURCES}
visualization/columnwise_summary.cpp
REQUIRES
flexible_type
pylambda
Expand Down
7 changes: 6 additions & 1 deletion src/unity/lib/visualization/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
project(unity)

# HACK HACK HACK
# columnwise_summary.cpp should be in this file, not the parent directory,
# but including it here for some reason causes linker errors
# in release/test (C++ unit tests) - but not debug! And only on Linux.
# Not sure why.

make_library(
visualization
SOURCES
boxes_and_whiskers.cpp
categorical_heatmap.cpp
columnwise_summary.cpp
escape.cpp
groupby.cpp
heatmap.cpp
Expand Down
1 change: 1 addition & 0 deletions src/unity/lib/visualization/columnwise_summary.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "columnwise_summary.hpp"
#include <unity/lib/unity_sframe.hpp>

namespace turi {
namespace visualization {
Expand Down
4 changes: 2 additions & 2 deletions src/unity/lib/visualization/columnwise_summary.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include <unity/lib/visualization/summary_view.hpp>
#include <unity/lib/visualization/vega_data.hpp>
#include <unity/lib/visualization/vega_spec.hpp>
#include <unity/lib/unity_sframe.hpp>
#include <unity/lib/gl_sframe.hpp>

namespace turi {
class unity_sframe_base;

namespace visualization {
std::shared_ptr<Plot> plot_columnwise_summary(
const std::string& path_to_client, std::shared_ptr<unity_sframe_base> sf);
Expand Down

0 comments on commit 2c765f9

Please sign in to comment.