From 1b35bca4225eae57bab1101f8716b1f9903b29f7 Mon Sep 17 00:00:00 2001 From: Ulises Jeremias Cornejo Fandos Date: Wed, 31 Jan 2018 02:43:10 -0300 Subject: [PATCH 1/3] Update cml.h --- cml/include/cml.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cml/include/cml.h b/cml/include/cml.h index 80efa91..69af5da 100644 --- a/cml/include/cml.h +++ b/cml/include/cml.h @@ -62,16 +62,16 @@ __builtin_types_compatible_p(__typeof(__a), __typeof(__b)) #endif -#include "cml/include/math.h" +#include "cml/math.h" /* #ifndef CML_NO_STRUCTURES - #include "cml/include/structures.h" + #include "cml/structures.h" #endif */ #ifndef CML_NO_EASING_FUNCTIONS - #include "cml/include/easings.h" + #include "cml/easings.h" #endif #endif From 424daacf16ab7fd6ea0e74743e5d89701a11e91c Mon Sep 17 00:00:00 2001 From: ulises-jeremias Date: Wed, 31 Jan 2018 07:33:40 -0300 Subject: [PATCH 2/3] Updated --- .gitignore | 2 +- cml/CMakeLists.txt | 2 +- cml/include/cml.h | 2 +- test/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f1052c0..508b2cd 100644 --- a/.gitignore +++ b/.gitignore @@ -51,7 +51,7 @@ Module.symvers Mkfile.old dkms.conf -cml/include/config.h +cml/include/cml/config.h build/* tmp/* install/* diff --git a/cml/CMakeLists.txt b/cml/CMakeLists.txt index b199031..2941cea 100644 --- a/cml/CMakeLists.txt +++ b/cml/CMakeLists.txt @@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(include) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/include/config.h + ${CMAKE_CURRENT_SOURCE_DIR}/include/cml/config.h ) SET(CML_MAIN_HEADERS diff --git a/cml/include/cml.h b/cml/include/cml.h index 69af5da..898320d 100644 --- a/cml/include/cml.h +++ b/cml/include/cml.h @@ -31,7 +31,7 @@ #define _CML_INLINE inline __attribute__((always_inline)) #endif -#include "config.h" +#include "cml/config.h" /* Use `extern inline` for C99 or later */ #ifdef PREDEF_STANDARD_C99 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f035a19..c5f13b5 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/cml/include) INCLUDE(../cmake/CMakeBuildFlags.cmake) From dec4065eaa8df041d5cc221eb0b570fa16435964 Mon Sep 17 00:00:00 2001 From: ulises-jeremias Date: Wed, 31 Jan 2018 07:41:03 -0300 Subject: [PATCH 3/3] Updated --- cml/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cml/CMakeLists.txt b/cml/CMakeLists.txt index 2941cea..9301389 100644 --- a/cml/CMakeLists.txt +++ b/cml/CMakeLists.txt @@ -8,10 +8,10 @@ configure_file( SET(CML_MAIN_HEADERS include/cml.h - include/config.h ) SET(CML_CML_HEADERS + include/cml/config.h include/cml/structures.h include/cml/math.h include/cml/easings.h @@ -166,7 +166,7 @@ INSTALL(TARGETS ${CML_LIB_TARGET} ARCHIVE DESTINATION lib${LIB_SUFFIX} ) INSTALL(FILES ${CML_MAIN_HEADERS} DESTINATION include) -INSTALL(FILES ${CML_CML_HEADERS} DESTINATION include/cml/include) +INSTALL(FILES ${CML_CML_HEADERS} DESTINATION include/cml) INSTALL(FILES ${CML_MATH_HEADERS} DESTINATION include/cml/math) INSTALL(FILES ${CML_MATH_TYPES_HEADERS} DESTINATION include/cml/math/types) INSTALL(FILES ${CML_MATH_FUNC_HEADERS} DESTINATION include/cml/math/functions)