Merge remote-tracking branch 'origin/an/unite-tests' into an/unite-tests

Author: allnes

.github/workflows/main.yml

@@ -977,7 +977,7 @@ jobs:
           PPC_NUM_PROC: 1
           PPC_NUM_THREADS: 13
   ubuntu-gcc-build-codecov:
-    needs:
+#    needs:
 #      - ubuntu-gcc-test-extended
 #      - ubuntu-clang-test-extended
 #      - macos-clang-test-extended

modules/core/CMakeLists.txt

@@ -26,16 +26,19 @@ set_target_properties(${exec_func_lib} PROPERTIES LINKER_LANGUAGE CXX)
 add_dependencies(${exec_func_lib} ppc_libenvpp)
 target_link_directories(${exec_func_lib} PUBLIC "${CMAKE_BINARY_DIR}/ppc_libenvpp/install/lib")
 target_link_directories(${exec_func_lib} PUBLIC "${CMAKE_BINARY_DIR}/ppc_libenvpp/build")
+
 if(MSVC)
-  target_link_libraries(${exec_func_lib} PUBLIC fmt libenvpp)
+  target_link_libraries(${exec_func_lib} PUBLIC libenvpp)
 else()
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    target_link_libraries(${exec_func_lib} PUBLIC fmtd envpp)
-  else()
-    target_link_libraries(${exec_func_lib} PUBLIC fmt envpp)
-  endif()
+  target_link_libraries(${exec_func_lib} PUBLIC envpp)
 endif ()
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  target_link_libraries(${exec_func_lib} PUBLIC fmtd)
+else()
+  target_link_libraries(${exec_func_lib} PUBLIC fmt)
+endif()
+
 add_dependencies(${exec_func_lib} ppc_json)
 target_link_directories(${exec_func_lib} INTERFACE "${CMAKE_BINARY_DIR}/ppc_json/install/include")