diff options
| author | Yi Kong <yikong@google.com> | 2022-02-25 16:32:14 +0800 |
|---|---|---|
| committer | Yi Kong <yikong@google.com> | 2022-02-25 15:08:55 +0000 |
| commit | 2aab794c004027d008d6b0b64165bf1961d5d2bb (patch) | |
| tree | 83bb8f19c67bcafdb2ca4a98414af1b17392ec36 /demos | |
| parent | ca5aa72016f062fd0712bcb86370478de332bca3 (diff) | |
| download | eigen-2aab794c004027d008d6b0b64165bf1961d5d2bb.tar.gz | |
Upgrade eigen to 3.4.0
Steps:
* Removed common files between Android copy and the matching upstream copy
* Obtained latest upstream tarball (see README.version)
* Extracted over the directory
Bug: 148287349
Test: presubmit
Change-Id: Iee2744719075fdf000b315e973645923da766111
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | demos/mandelbrot/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | demos/mix_eigen_and_c/README | 2 | ||||
| -rw-r--r-- | demos/mix_eigen_and_c/binary_library.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index b0d2eddbb..deb560f09 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -7,7 +7,7 @@ if(NOT EIGEN_TEST_NOQT) if(QT4_FOUND) add_subdirectory(mandelbrot) add_subdirectory(opengl) - else(QT4_FOUND) + else() message(STATUS "Qt4 not found, so disabling the mandelbrot and opengl demos") - endif(QT4_FOUND) + endif() endif() diff --git a/demos/mandelbrot/CMakeLists.txt b/demos/mandelbrot/CMakeLists.txt index 5c500e064..ae6001dbc 100644 --- a/demos/mandelbrot/CMakeLists.txt +++ b/demos/mandelbrot/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) if (CMAKE_COMPILER_IS_GNUCXX) set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") add_definitions ( "-DNDEBUG" ) -endif (CMAKE_COMPILER_IS_GNUCXX) +endif () include_directories( ${QT_INCLUDE_DIR} ) diff --git a/demos/mix_eigen_and_c/README b/demos/mix_eigen_and_c/README index 21dba8679..d9cc9275d 100644 --- a/demos/mix_eigen_and_c/README +++ b/demos/mix_eigen_and_c/README @@ -6,4 +6,4 @@ To try this with GCC, do: gcc example.c binary_library.o -o example -lstdc++ ./example -TODO: add CMakeLists, add more explanations here
\ No newline at end of file +TODO: add CMakeLists, add more explanations here diff --git a/demos/mix_eigen_and_c/binary_library.h b/demos/mix_eigen_and_c/binary_library.h index 0b983ad3a..9b63fac2f 100644 --- a/demos/mix_eigen_and_c/binary_library.h +++ b/demos/mix_eigen_and_c/binary_library.h @@ -68,4 +68,4 @@ extern "C" #ifdef __cplusplus } // end extern "C" -#endif
\ No newline at end of file +#endif |