Merge pull request #22 from MUSIC-fluid/chun_dev

fix CMake settings for Eigen3

Author: chunshen1987

CMakeLists.txt

@@ -19,12 +19,12 @@ find_package(GSL)
 if (GSL_FOUND)
     message("Found GSL library ${GSL_INCLUDE_DIR}, will build MUSIC with GSL")
     include_directories(${GSL_INCLUDE_DIR})
-elseif()
+else()
     message("Did not find GSL library, will build MUSIC alone")
 endif()
 
 find_package (Eigen3 REQUIRED)
-include_directories(${EIGEN3_INCLUDE_DIR})
+#include_directories(${EIGEN3_INCLUDE_DIR})
 
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)

src/CMakeLists.txt

@@ -43,13 +43,14 @@ if (GSL_FOUND)
 endif()
 
 add_library(${libname} SHARED ${SOURCES})
+target_link_libraries (${libname} Eigen3::Eigen)
 set(CompileFlags "")
 if (APPLE)
     set(CompileFlags "${CompileFlags} -DAPPLE")
 endif (APPLE)
 if (GSL_FOUND)
     set(CompileFlags "${CompileFlags} -DGSL")
-    target_link_libraries (${libname} ${GSL_LIBRARIES} ${EIGEN3_LIBRARIES})
+    target_link_libraries (${libname} ${GSL_LIBRARIES})
 endif()
 set_target_properties (${libname} PROPERTIES COMPILE_FLAGS "${CompileFlags}")
 install(TARGETS ${libname} DESTINATION ${CMAKE_HOME_DIRECTORY})
@@ -76,6 +77,7 @@ else (unittest)
         target_link_libraries (${exename} ${libname})
     else (link_with_lib)
         add_executable (${exename} main.cpp ${SOURCES})
+        target_link_libraries (${exename} Eigen3::Eigen)
         if (GSL_FOUND)
             target_link_libraries (${exename} ${GSL_LIBRARIES})
         endif (GSL_FOUND)

src/doctest.h

@@ -2299,9 +2299,9 @@ class DOCTEST_INTERFACE Context {
 #endif  // DOCTEST_CONFIG_WITH_VARIADIC_MACROS
 
 // for subcases
-#define DOCTEST_SUBCASE(name)                                            \
-    if (const doctest::detail::Subcase                                   \
-            & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED = \
+#define DOCTEST_SUBCASE(name)                              \
+    if (const doctest::detail::Subcase& DOCTEST_ANONYMOUS( \
+            _DOCTEST_ANON_SUBCASE_) DOCTEST_UNUSED =       \
             doctest::detail::Subcase(name, __FILE__, __LINE__))
 
 // for grouping tests in test suites by using code blocks
@@ -2488,7 +2488,7 @@ constexpr T to_lvalue = x;
                 #expr, DOCTEST_TOSTR(DOCTEST_HANDLE_BRACED_VA_ARGS(as)));     \
             try {                                                             \
                 expr;                                                         \
-            } catch (const DOCTEST_HANDLE_BRACED_VA_ARGS(as)&) {              \
+            } catch (const DOCTEST_HANDLE_BRACED_VA_ARGS(as) &) {             \
                 _DOCTEST_RB.m_threw = true;                                   \
                 _DOCTEST_RB.m_threw_as = true;                                \
             } catch (...) {                                                   \
@@ -4348,9 +4348,10 @@ void Color::init() {
 #endif  // DOCTEST_CONFIG_COLORS_WINDOWS
 }
 
-void Color::use(Code
+void Color::use(
+    Code
 #ifndef DOCTEST_CONFIG_COLORS_NONE
-                    code
+        code
 #endif  // DOCTEST_CONFIG_COLORS_NONE
 ) {
     const ContextState* p = contextState;

src/hydro_source_TATB.cpp

@@ -472,8 +472,7 @@ double HydroSourceTATB::compute_yL(
     double denom = sqrt_a * denom_base;
 
     // robust regularization
-    denom = std::copysign(
-        std::max(std::abs(denom), Util::small_eps), denom);
+    denom = std::copysign(std::max(std::abs(denom), Util::small_eps), denom);
 
     // ------------------------------
     // 3. denum
@@ -575,8 +574,7 @@ double HydroSourceTATB::energy_eta_profile_normalisation_tilted(
     double denom_base = 4.0 * eta_m * eta_m - loga * loga;
     double denom = sqrt_a * denom_base;
     // robust regularization
-    denom = std::copysign(
-        std::max(std::abs(denom), Util::small_eps), denom);
+    denom = std::copysign(std::max(std::abs(denom), Util::small_eps), denom);
 
     // ------------------------------
     // Term 3