Martin's comments

swift-nav · Mar 28, 2019 · f99223f · f99223f
1 parent 4b97834
commit f99223f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,18 +26,6 @@ target_include_directories(albatross SYSTEM INTERFACE
 
 include(${PROJECT_SOURCE_DIR}/cmake/FindGFlags.cmake)
 
-add_subdirectory(tests)
-add_subdirectory(examples)
-
-set(albatross_BINARIES
-  albatross_unit_tests
-  sinc_example
-  temperature_example
-  call_trace_example
-  inspection_example
-  )
-
-
 set(albatross_COMPILE_OPTIONS
   -Werror
   -Wall
@@ -78,12 +66,6 @@ set(albatross_COMPILE_OPTIONS
   -Wvolatile-register-var
   -Wwrite-strings
   )
-set_target_properties(
-  ${albatross_BINARIES}
-  PROPERTIES
-  CXX_STANDARD 14
-  CXX_STANDARD_REQUIRED ON
-  )
-foreach(TARGET IN LISTS albatross_BINARIES)
-  target_compile_options(${TARGET} PRIVATE ${albatross_COMPILE_OPTIONS})
-endforeach()
+
+add_subdirectory(tests)
+add_subdirectory(examples)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -58,3 +58,22 @@ add_custom_target(run_call_trace_example
   COMMAND call_trace_example
   COMMENT "Running call_trace_example"
   )
+
+set(albatross_example_BINARIES
+  sinc_example
+  temperature_example
+  call_trace_example
+  inspection_example
+  )
+
+
+set_target_properties(
+  ${albatross_example_BINARIES}
+  PROPERTIES
+  CXX_STANDARD 14
+  CXX_STANDARD_REQUIRED ON
+  )
+foreach(TARGET IN LISTS albatross_example_BINARIES)
+  target_compile_options(${TARGET} PRIVATE ${albatross_COMPILE_OPTIONS})
+endforeach()
+
diff --git a/examples/sinc_example_utils.h b/examples/sinc_example_utils.h
@@ -13,9 +13,10 @@
 #ifndef ALBATROSS_SINC_EXAMPLE_UTILS_H
 #define ALBATROSS_SINC_EXAMPLE_UTILS_H
 
-#include "example_utils.h"
 #include <albatross/GP>
 
+#include "example_utils.h"
+
 namespace albatross {
 
 class SlopeTerm : public CovarianceFunction<SlopeTerm> {

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,5 +1,4 @@
-add_executable(albatross_unit_tests
-  EXCLUDE_FROM_ALL
+add_executable(albatross_unit_tests EXCLUDE_FROM_ALL
   test_call_trace.cc
   test_core_dataset.cc
   test_core_distribution.cc
@@ -52,3 +51,12 @@ add_custom_target(run_albatross_unit_tests ALL
 add_dependencies(run_albatross_unit_tests
   albatross_unit_tests
   )
+
+set_target_properties(
+  albatross_unit_tests
+  PROPERTIES
+  CXX_STANDARD 14
+  CXX_STANDARD_REQUIRED ON
+  )
+
+target_compile_options(albatross_unit_tests PRIVATE ${albatross_COMPILE_OPTIONS})