Cleanup warnings (level 3)

Tune up build options

Author: flexferrum

CMakeLists.txt

@@ -29,7 +29,6 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR ${CMAKE_CXX_COMPILER_ID} MATCHES
     endif ()
 else ()
     # MSVC
-    # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14")
 
     if (NOT DEFINED MSVC_RUNTIME_TYPE)
         if (NOT WITH_TESTS)

cmake/build_thirdparty.cmake

@@ -1,4 +1,4 @@
-macro (BuildThirdparty TargetName ThirdpartySrcPath ThirdpartyOutFile)
+macro (BuildThirdparty TargetName ThirdpartySrcPath ThirdpartyOutFile ExtraBuildOptions)
 
     set (BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${TargetName}/build)
     set (INST_DIR ${CMAKE_CURRENT_BINARY_DIR}/${TargetName}/install)
@@ -7,7 +7,7 @@ macro (BuildThirdparty TargetName ThirdpartySrcPath ThirdpartyOutFile)
 
     add_custom_command (
         OUTPUT ${BUILD_DIR}/CMakeCache.txt
-        COMMAND ${CMAKE_COMMAND} ARGS -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX="${INST_DIR}" -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} "${ThirdpartySrcPath}"
+        COMMAND ${CMAKE_COMMAND} ARGS -G "${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX="${INST_DIR}" -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} "${ThirdpartySrcPath}" ${ExtraBuildOptions}
         WORKING_DIRECTORY ${BUILD_DIR}
         COMMENT "Prebuild ${TargetName} library"
     )

include/jinja2cpp/reflected_value.h

@@ -116,7 +116,7 @@ struct ContainerReflector
         Value GetValueByIndex(int64_t idx) const override
         {
             auto p = m_value.begin();
-            std::advance(p, idx);
+            std::advance(p, static_cast<size_t>(idx));
             return Reflect(*p);
         }
     };

src/expression_evaluator.cpp

@@ -278,8 +278,8 @@ Value CallExpression::CallGlobalRange(RenderContext& values)
 
         size_t GetSize() const override
         {
-            size_t count = (m_stop - m_start);
-            return count / m_step;
+            size_t count = static_cast<size_t>(m_stop - m_start);
+            return static_cast<size_t>(count / m_step);
         }
         Value GetValueByIndex(int64_t idx) const
         {
@@ -304,7 +304,7 @@ Value CallExpression::CallLoopCycle(RenderContext& values)
 
     const ValuesMap* loop = boost::get<ValuesMap>(&loopValP->second.data());
     int64_t baseIdx = boost::apply_visitor(visitors::IntegerEvaluator(), (*loop).at("index0").data());
-    auto idx = baseIdx % m_params.posParams.size();
+    auto idx = static_cast<size_t>(baseIdx % m_params.posParams.size());
     return m_params.posParams[idx]->Evaluate(values);
 }
 

src/lexertk.h

@@ -119,7 +119,7 @@ namespace lexertk
           {
               return std::isdigit(c, get_locale());
           }
-          static bool is_letter_or_digit(const char c)
+          static bool is_letter_or_digit(CharT c)
           {
               return std::isalnum(c, get_locale());
           }

src/statements.cpp

@@ -14,7 +14,7 @@ struct ValuesListAdaptorCreator : public boost::static_visitor<std::function<con
         }
 
         size_t GetSize() const override {return m_list->size();}
-        Value GetValueByIndex(int64_t idx) const override {return (*m_list)[idx];};
+        Value GetValueByIndex(int64_t idx) const override {return (*m_list)[static_cast<size_t>(idx)];};
 
         const ValuesList* m_list;
     };

thirdparty/CMakeLists.txt

@@ -5,4 +5,18 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
 
 include (build_thirdparty)
 
-BuildThirdparty(gtest ${CMAKE_CURRENT_SOURCE_DIR}/gtest include/gmock/gmock.h )
+if (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+    message (STATUS "######### <<<<<<<<< !!!!!!!!!!!!")
+    if (MSVC_RUNTIME_TYPE STREQUAL "/MD" OR NOT MSVC_RUNTIME_TYPE)
+        set (GTEST_EXTRA_OPTIONS "-Dgtest_force_shared_crt=TRUE")
+    else ()
+        set (GTEST_EXTRA_OPTIONS "-Dgtest_force_shared_crt=TRUE")
+    endif ()
+else ()
+    message (STATUS "######### <<<<<<<<< ????????")
+endif ()
+
+message (STATUS "#### CMAKE_CXX_COMPILER_ID: '${CMAKE_CXX_COMPILER_ID}'")
+message (STATUS "#### GTEST_EXTRA_OPTIONS: ${GTEST_EXTRA_OPTIONS}")
+
+BuildThirdparty(gtest ${CMAKE_CURRENT_SOURCE_DIR}/gtest include/gmock/gmock.h "${GTEST_EXTRA_OPTIONS}")