From ce25246dff713fa1cf2783ce338b03dc913a4df0 Mon Sep 17 00:00:00 2001 From: Adam Paquette Date: Thu, 29 Nov 2018 16:42:57 -0700 Subject: [PATCH] Added functions to h file and update library name in cmake files --- CMakeLists.txt | 2 +- include/eal.h | 6 ++++++ tests/CMakeLists.txt | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fdfc4d..fd62d44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ #=============================================================================== -# The main build file for building SpiceRefactor using CMake. +# The main build file for building EAL using CMake. #=============================================================================== # CMake initialization diff --git a/include/eal.h b/include/eal.h index 8ea9656..1f81642 100644 --- a/include/eal.h +++ b/include/eal.h @@ -12,4 +12,10 @@ vector getVelocity(vector> coords, vector coeffs, vector getPosition(vector coeffs, char *interp, double time); vector getVelocity(vector coeffs, char *interp, double time, bool interpolation); +vector getRotation(char *from, char *to, vector> rotations, vector times, char *interp, double time); +vector getAngularVelocity(char *from, char *to, vector> rotations, vector times, char *interp, double time); + +vector getRotation(char *from, char *to, vector coefficients, char *interp, double time); +vector getAngularVelocity(char *from, char *to, vector coefficients, char *interp, double time); + #endif // EAL_H diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 59db823..394688e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.10) file(GLOB test_source "${CMAKE_SOURCE_DIR}/tests/*.cpp") -# Link runSpiceRefactorTests with what we want to test and the GTest and pthread library -add_executable(runSpiceRefactorTests +# Link runEALTests with what we want to test and the GTest and pthread library +add_executable(runEALTests TestMain.cpp ${test_source}) -target_link_libraries(runSpiceRefactorTests usgsephem ${ALLLIBS} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} pthread) +target_link_libraries(runEALTests usgsephem ${ALLLIBS} ${GTEST_LIBRARIES} ${GTEST_MAIN_LIBRARIES} pthread) -gtest_discover_tests(runSpiceRefactorTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../tests) +gtest_discover_tests(runEALTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../tests) -- GitLab