Merge pull request #110 from nassipkali/main

translated build of interfaces to conan 2.0

cpp/CMakeLists.txt

@@ -7,20 +7,31 @@ set(CONAN_DISABLE_CHECK_COMPILER TRUE)
 set(LINKS_PLATFORM_TESTS TRUE)
 
 project(Platform.Interfaces CXX)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+find_package(GTest)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
+# Set compiler flags for x86_64 architecture
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=haswell")
+endif()
 
-list(APPEND LINKS_PLATFORM_EXTRA_FLAGS ${CONAN_USER_PLATFORM.HASHING_suggested_flags})
+# Set compiler flags for armv7 architecture
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv7")
+endif()
+
+# Set compiler flags for armv8 architecture
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armv8")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a")
+endif()
 
 add_library(${PROJECT_NAME}.Library INTERFACE)
 target_include_directories(${PROJECT_NAME}.Library INTERFACE ${PROJECT_NAME})
 
-target_compile_options(${PROJECT_NAME}.Library INTERFACE ${LINKS_PLATFORM_EXTRA_FLAGS})
-
 if(${LINKS_PLATFORM_TESTS})
     add_executable(${PROJECT_NAME}.Tests ${PROJECT_NAME}.Tests/${PROJECT_NAME}.Tests.cpp)
     set_target_properties(${PROJECT_NAME}.Tests PROPERTIES CXX_STANDARD 20)
-    target_link_libraries(${PROJECT_NAME}.Tests PRIVATE CONAN_PKG::gtest)
+    target_link_libraries(${PROJECT_NAME}.Tests PRIVATE GTest::gtest)
+    target_link_libraries(${PROJECT_NAME}.Tests PRIVATE GTest::gtest_main)
     target_link_libraries(${PROJECT_NAME}.Tests PRIVATE ${PROJECT_NAME}.Library)
 endif()

cpp/conanfile.txt

@@ -2,4 +2,5 @@
 gtest/cci.20210126
 
 [generators]
-cmake
+CMakeDeps
+CMakeToolchain