From 5163e9cd053f1074804712e43d66a73b1f79f080 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 6 Oct 2017 12:06:40 -0400 Subject: [PATCH 1/3] merging --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 1884a761e..466db3141 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 1884a761e4a0296b59c6801ec7e62acca4d22997 +Subproject commit 466db3141f44511d722eee94afad4b32c6b3bf05 From 6522bf531e70520c29026e8d59ac88d368b1c386 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 6 Oct 2017 12:14:31 -0400 Subject: [PATCH 2/3] don't know why we have to commit this --- externals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals b/externals index 466db3141..1884a761e 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 466db3141f44511d722eee94afad4b32c6b3bf05 +Subproject commit 1884a761e4a0296b59c6801ec7e62acca4d22997 From 4507e637ba5b83c1ebe4573e0fce6f505f84cff5 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Fri, 6 Oct 2017 12:28:57 -0400 Subject: [PATCH 3/3] cmake (no change) --- src/server/sparkd/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/sparkd/CMakeLists.txt b/src/server/sparkd/CMakeLists.txt index 85e59db6a..e15e6ec0b 100644 --- a/src/server/sparkd/CMakeLists.txt +++ b/src/server/sparkd/CMakeLists.txt @@ -44,3 +44,5 @@ target_link_libraries( sparkd # copy test data file(COPY jetfix/tests/sample_fix.dat DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_data) + + \ No newline at end of file