MSVC: lost fight against gtest.dll and libgtest.lib

Core/Tools/inc/IStochasticParameter.h

@@ -29,14 +29,30 @@ class BA_CORE_API_ IStochasticParameter : public ICloneable
 template <class T> class BA_CORE_API_ StochasticParameter : public IStochasticParameter
 {
  public:
-    StochasticParameter(T average);
+    StochasticParameter(T average) : m_average(average)
+	{
+		setToAverage();
+	}
+
     virtual ~StochasticParameter() {}
     virtual StochasticParameter<T> *clone() const=0;
 
-    virtual void setToAverage();
+    virtual void setToAverage() { m_current = m_average; }
+
     T getCurrent() const { return m_current; }
-    T getAverage();
-    virtual T getRandom();
+
+    T getAverage()
+	{
+		setToAverage();
+		return m_current;
+	}
+
+    virtual T getRandom()
+	{
+	    setToRandom();
+		return m_current;
+	}
+
     virtual double probabilityDensity(T value) const=0;
     virtual double getFWHM() const { return 0.0;}
 
@@ -45,29 +61,6 @@ template <class T> class BA_CORE_API_ StochasticParameter : public IStochasticPa
     T m_average;
 };
 
-template <class T> StochasticParameter<T>::StochasticParameter(T average)
-    : m_average(average)
-{
-    setToAverage();
-}
-
-template <class T> inline void StochasticParameter<T>::setToAverage()
-{
-    m_current = m_average;
-}
-
-template <class T> inline T StochasticParameter<T>::getAverage()
-{
-    setToAverage();
-    return m_current;
-}
-
-template <class T> inline T StochasticParameter<T>::getRandom()
-{
-    setToRandom();
-    return m_current;
-}
-
 #endif // ISTOCHASTICPARAMETER_H
 
 

Tests/UnitTests/TestCore/AxisDoubleTest.h

@@ -39,7 +39,7 @@ TEST_F(AxisDoubleTest, AddElementsToEmpty)
 {
     angleAxis.push_back(1.0f);
     ASSERT_EQ((size_t)1, angleAxis.getSize());
-    EXPECT_FLOAT_EQ(1.0f, angleAxis[0]);
+    EXPECT_FLOAT_EQ(1.0, (float)angleAxis[0]);
 }
 
 TEST_F(AxisDoubleTest, ExtendedConstructor)

Tests/UnitTests/TestCore/CMakeLists.txt

@@ -6,9 +6,14 @@ enable_testing()
 
 add_executable( TestCore main.cpp )
 
+#set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
+#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+
 # dependencies
 include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 target_link_libraries(TestCore gtest)
+add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+
 
 include_directories(${BornAgainCore_INCLUDE_DIRS})
 target_link_libraries(TestCore ${BornAgainCore_LIBRARY}) 

Tests/UnitTests/TestCore/ChiSquaredModuleTest.h

@@ -68,15 +68,15 @@ TEST_F(ChiSquaredModuleTest, CloneOfEmpty)
 
 TEST_F(ChiSquaredModuleTest, DefaultModule)
 {
-    EXPECT_FLOAT_EQ( double(0.01), m_chi_default.calculateChiSquared());
+    EXPECT_FLOAT_EQ( 0.01, (float)m_chi_default.calculateChiSquared());
 }
 
 TEST_F(ChiSquaredModuleTest, CloneOfDefault)
 {
     ChiSquaredModule *clone_of_default = m_chi_default.clone();
-    EXPECT_FLOAT_EQ( double(0.01), clone_of_default->calculateChiSquared());
+    EXPECT_FLOAT_EQ( 0.01, (float)clone_of_default->calculateChiSquared());
     clone_of_default->setNdegreeOfFreedom(1);
-    EXPECT_FLOAT_EQ( double(1.0), clone_of_default->calculateChiSquared());
+    EXPECT_FLOAT_EQ( 1.0, (float)clone_of_default->calculateChiSquared());
     delete clone_of_default;
 }
 
@@ -101,7 +101,7 @@ TEST_F(ChiSquaredModuleTest, IsGISAXSLikeModule)
     chi_isgisaxs.setRealAndSimulatedData(real_data, simul_data);
     OutputDataNormalizer normalizer(100., 0.0);
     chi_isgisaxs.setOutputDataNormalizer( normalizer );
-    EXPECT_FLOAT_EQ( double(0.0), chi_isgisaxs.calculateChiSquared());
+    EXPECT_FLOAT_EQ( 0.0, (float)chi_isgisaxs.calculateChiSquared());
 
 //    m_chi_isgisaxs.setChiSquaredFunction( SquaredFunctionWithSystematicError(1.0) );
 //    EXPECT_FLOAT_EQ( double(0.005), m_chi_isgisaxs.calculateChiSquared());

Tests/UnitTests/TestCore/main.cpp

+#ifdef _MSC_VER
+#define _VARIADIC_MAX 10
+#endif
 #include "gtest/gtest.h"
 
 #include "AxisDoubleTest.h"

ThirdParty/gtest/CMakeLists.txt

@@ -7,10 +7,26 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_VARIADIC_MAX=10")
 endif()
 
+#set(BUILD_SHARED_LIBS ON)
 add_subdirectory(gtest-1.6.0)
 set_Target_properties(${gtest} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
 set(gtest_LIBRARY_TYPE SHARED)
 
+# ---
+
+#include_directories(
+#    ${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.6.0
+#    ${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.6.0/include
+#)
+#link_directories(${CMAKE_CURRENT_SOURCE_DIR}/gtest-1.6.0/src)
+
+#add_library(
+#    gtest
+#    SHARED
+#    gtest-1.6.0/src/gtest-all.cc
+#)
+#set_Target_properties(gtest PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
+#set(gtest_LIBRARY_TYPE SHARED)
 
 
 

ThirdParty/gtest/gtest-1.6.0/CMakeLists.txt

@@ -8,6 +8,7 @@
 # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to
 # make it prominent in the GUI.
 option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF)
+#option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." ON)
 
 # When other libraries are using a shared version of runtime libraries,
 # Google Test also has to use one.
@@ -67,7 +68,18 @@ link_directories(${gtest_BINARY_DIR}/src)
 # Google Test libraries.  We build them using more strict warnings than what
 # are used for other targets, to ensure that gtest can be compiled by a user
 # aggressive about warnings.
+
+#if(MSVC)
+#add_library(
+#    gtest
+#    SHARED
+#    src/gtest-all.cc
+#)
+#set_Target_properties(gtest PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
+#set(gtest_LIBRARY_TYPE SHARED)
+#else()
 cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
+
 #cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
 #target_link_libraries(gtest_main gtest)
 

cmake/modules/SearchInstalledSoftware.cmake

@@ -32,9 +32,9 @@ if(BORNAGAIN_PYTHON)
     list(APPEND boost_libraries_required python)
 endif()
 find_package(Boost 1.48.0 COMPONENTS ${boost_libraries_required} REQUIRED)
-message(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
-message(STATUS "Boost_LIBRARY_DIRS: ${Boost_LIBRARY_DIRS}")
-message(STATUS "Boost_LIBRARIES: ${Boost_LIBRARIES}")
+#message(STATUS "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
+#message(STATUS "Boost_LIBRARY_DIRS: ${Boost_LIBRARY_DIRS}")
+#message(STATUS "Boost_LIBRARIES: ${Boost_LIBRARIES}")
 
 # --- GSL ---
 if(NOT BUILTIN_GSL)