diff --git a/ThirdParty/googletest-release-1.8.0/CMakeLists.txt b/ThirdParty/googletest-release-1.8.0/CMakeLists.txt index 8d2b552e..c36505c2 100644 --- a/ThirdParty/googletest-release-1.8.0/CMakeLists.txt +++ b/ThirdParty/googletest-release-1.8.0/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.2) +cmake_minimum_required(VERSION 3.1) project( googletest-distribution ) diff --git a/ThirdParty/googletest-release-1.8.0/googletest/CMakeLists.txt b/ThirdParty/googletest-release-1.8.0/googletest/CMakeLists.txt index 621d0f04..acd805f6 100644 --- a/ThirdParty/googletest-release-1.8.0/googletest/CMakeLists.txt +++ b/ThirdParty/googletest-release-1.8.0/googletest/CMakeLists.txt @@ -45,7 +45,7 @@ endif() # ${gtest_BINARY_DIR}. # Language "C" is required for find_package(Threads). project(gtest CXX C) -cmake_minimum_required(VERSION 2.6.2) +cmake_minimum_required(VERSION 3.1) if (COMMAND set_up_hermetic_build) set_up_hermetic_build() diff --git a/extension/mic-asp-sdk/CMakeLists.txt b/extension/mic-asp-sdk/CMakeLists.txt index 697d4027..2e6ef03d 100644 --- a/extension/mic-asp-sdk/CMakeLists.txt +++ b/extension/mic-asp-sdk/CMakeLists.txt @@ -12,7 +12,6 @@ AUX_SOURCE_DIRECTORY(./srcs MIC_ASP_SRC) ADD_LIBRARY(${LIB_PROJECT_TARGET} SHARED ${MIC_ASP_SRC} ${WORK_HEADS}) -#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DCLI_SUPPORT=1 -funwind-tables -D__ARM_PCS_VFP") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O2 -fPIC -DCLI_SUPPORT=1 -funwind-tables") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O2 -fPIC -DCLI_SUPPORT=1 -funwind-tables -D__ARM_PCS_VFP") TARGET_LINK_LIBRARIES(${LIB_PROJECT_TARGET} -ldl -lstdc++ -lpthread -lrt -lasound) \ No newline at end of file