Changed location of common's GLOBAL PROPERTY

CMakeLists.txt

@@ -8,6 +8,14 @@ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall")
 ENDIF(WIN32)
 
+#TODO: Better way then GLOBAL PROPERTY
+IF(WIN32)
+    find_package(Threads REQUIRED)
+    SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
+ELSEIF(UNIX)
+    SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES Threads::Threads)
+ENDIF(WIN32)
+
 option(BUILD_TESTS "Uses googletest to build tests" OFF)
 option(BUILD_INTEGRATION_TESTS "Include integration tests (CMAKE >3.7 is needed)" OFF)
 option(BUILD_DOCS "Uses doxygen to build the documentaion" OFF)

CMakeModules/testing_cpp.cmake

@@ -49,7 +49,7 @@ function(gtest target test_source_files linktarget)
         target_link_libraries(test-${target} ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
         GET_PROPERTY(HIDRA2_COMMON_IO_LIBRARIES GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES)
-        message(STATUS "SEARCHPATTERME HIDRA2_COMMON_IO_LIBRARIES: '${HIDRA2_COMMON_IO_LIBRARIES}'")
+        message(STATUS "HIDRA2_COMMON_IO_LIBRARIES: '${HIDRA2_COMMON_IO_LIBRARIES}'")
         target_link_libraries(test-${target} ${HIDRA2_COMMON_IO_LIBRARIES})
 
         if (NOT ${test_libraries} STREQUAL "")

common/cpp/CMakeLists.txt

@@ -11,12 +11,3 @@ endif()
 install(DIRECTORY ${HIDRA2_CXX_COMMON_INCLUDE_DIR}/common
         DESTINATION ${CMAKE_INSTALL_PREFIX}/include )
 
-################################
-# Library
-################################
-IF(WIN32)
-    find_package(Threads REQUIRED)
-    SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} wsock32 ws2_32)
-ELSEIF(UNIX)
-    SET_PROPERTY(GLOBAL PROPERTY HIDRA2_COMMON_IO_LIBRARIES Threads::Threads)
-ENDIF(WIN32)

common/cpp/unittests/json_parser/test_json_parser.cpp

@@ -204,7 +204,6 @@ TEST_F(ParseFileTests, CannotReadFile) {
 
     uint64_t id;
     auto err = parser.GetUInt64("_id", &id);
-    //TODO: @Sergey why not just checking error code?
     ASSERT_THAT(err->Explain(), HasSubstr(hidra2::IOErrorTemplate::kFileNotFound.Copy()->Explain()));