Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0bcfe42143df
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0ddca8d9fafa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 19, 2020

  1. Copy the full SHA
    c693fdf View commit details
  2. Merge pull request #2681 from pleroy/Clang

    Turns out we need the mathematica library
    pleroy authored Aug 19, 2020
    Copy the full SHA
    0ddca8d View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 Makefile
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ LIBRARY_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TR
ASTRONOMY_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard astronomy/*.cpp))
BASE_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard base/*.cpp))
JOURNAL_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard journal/*.cpp))
MATHEMATICA_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard mathematica/*.cpp))
NUMERICS_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard numerics/*.cpp))
PHYSICS_LIB_TRANSLATION_UNITS := $(filter-out $(TEST_OR_FAKE_OR_MOCK_TRANSLATION_UNITS), $(wildcard physics/*.cpp))
PROTO_FILES := $(wildcard */*.proto)
@@ -181,6 +182,7 @@ VERSION_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(VERSION_TRANSLAT
ASTRONOMY_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(ASTRONOMY_LIB_TRANSLATION_UNITS:.cpp=.o)) $(VERSION_OBJECTS)
BASE_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(BASE_LIB_TRANSLATION_UNITS:.cpp=.o)) $(VERSION_OBJECTS)
JOURNAL_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(JOURNAL_LIB_TRANSLATION_UNITS:.cpp=.o))
MATHEMATICA_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(MATHEMATICA_LIB_TRANSLATION_UNITS:.cpp=.o))
NUMERICS_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(NUMERICS_LIB_TRANSLATION_UNITS:.cpp=.o)) $(VERSION_OBJECTS)
PHYSICS_LIB_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(PHYSICS_LIB_TRANSLATION_UNITS:.cpp=.o))
TEST_OBJECTS := $(addprefix $(OBJ_DIRECTORY), $(TEST_TRANSLATION_UNITS:.cpp=.o))
@@ -240,7 +242,7 @@ $(TEST_BINS) : $(BIN_DIRECTORY)% : $(OBJ_DIRECTORY)%.o
$(PACKAGE_TEST_BINS) : $(BIN_DIRECTORY)%test : $$(filter $(OBJ_DIRECTORY)%$$(PERCENT), $(TEST_OBJECTS))
$(PRINCIPIA_TEST_BIN) : $(TEST_OBJECTS)

$(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(PROTO_OBJECTS) $(ASTRONOMY_LIB_OBJECTS) $(PHYSICS_LIB_OBJECTS) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
$(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(PROTO_OBJECTS) $(ASTRONOMY_LIB_OBJECTS) $(MATHEMATICA_LIB_OBJECTS) $(PHYSICS_LIB_OBJECTS) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
@mkdir -p $(@D)
$(CXX) $(LDFLAGS) $^ $(LIBS) -o $@

@@ -249,7 +251,7 @@ $(PLUGIN_INDEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_INDEPENDENT_TEST_BINS) : $(GMOC
# NOTE(egg): this assumes that only the plugin-dependent tests need to be linked
# against mock objects. The classes further up that are big enough to be mocked
# are likely to be highly templatized, so this will probably hold for a while.
$(PRINCIPIA_TEST_BIN) $(PLUGIN_DEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_DEPENDENT_TEST_BINS) : $(FAKE_OR_MOCK_OBJECTS) $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(KSP_PLUGIN) $(ASTRONOMY_LIB_OBJECTS) $(PHYSICS_LIB_OBJECTS) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
$(PRINCIPIA_TEST_BIN) $(PLUGIN_DEPENDENT_PACKAGE_TEST_BINS) $(PLUGIN_DEPENDENT_TEST_BINS) : $(FAKE_OR_MOCK_OBJECTS) $(GMOCK_OBJECTS) $(GMOCK_MAIN_OBJECT) $(KSP_PLUGIN) $(ASTRONOMY_LIB_OBJECTS) $(MATHEMATICA_LIB_OBJECTS) $(PHYSICS_LIB_OBJECTS) $(BASE_LIB_OBJECTS) $(NUMERICS_LIB_OBJECTS)
@mkdir -p $(@D)
$(CXX) $(LDFLAGS) $^ $(TEST_LIBS) $(LIBS) -lpthread -o $@