diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b59d2dc..da4408a9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,26 +8,6 @@ message("platform PATH = ${PLATFORM_PATH}") # Gdb debug include(build/sdk_config.cmake) -# if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) -# message("---------------------------Debug mode.-----------------------") -# SET(CMAKE_BUILD_TYPE "Debug") -# SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g2 -ggdb") -# SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall") -# # asan -# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined") -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined") -# else() -# message("---------------------------Release mode.-----------------------") -# SET(CMAKE_BUILD_TYPE "Release") -# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os") -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os") -# endif() - -# if(${COVERAGE_ON} MATCHES "true") -# message("you choose to build gcno file") -# add_definitions("-fprofile-arcs") -# add_definitions("-ftest-coverage") -# endif() # 查看是工具链支持情况 include(CheckCXXCompilerFlag) @@ -40,28 +20,8 @@ if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) # add_subdirectory(external/lvglLinux-x86) endif() -link_directories( - ${DEPENDENCY_LIBS_PATH}/live/${LIVE_PLATFORM_SRC_PATH} -) -string(COMPARE EQUAL "${PLATFORM_PATH}" "" value) -message("The platform path is ${PLATFORM_PATH}.") -if (value EQUAL 0) #变量被设置了 -message("build chip board libs.") -link_directories( - # ${DEPENDENCY_LIBS_PATH}/live/${LIVE_PLATFORM_SRC_PATH} -) -endif() - #Add macro definition -add_definitions(-DCONFIG_FILE_PATH=\"${CONFIG_FILE_PATH}\") -add_definitions(-DCONFIG_FILE_STATIC_PATH=\"${CONFIG_FILE_STATIC_PATH}\") -add_definitions(-DSF_DCF_EXT_PHOTO=\"${SF_DCF_EXT_PHOTO}\") -add_definitions(-DSF_DCF_EXT_MOV=\"${SF_DCF_EXT_MOV}\") -add_definitions(-DSF_SD_ROOT=\"${SF_SD_ROOT}\") -add_definitions(-DSF_DCF_DIR_NAME_SUFFIX=\"${SF_DCF_DIR_NAME_SUFFIX}\") -add_definitions(-DSF_DCF_ROOT_DIR_NAME=\"${SF_DCF_ROOT_DIR_NAME}\") -add_definitions(-DSF_DCF_THM_DIR_NAME=\"${SF_DCF_THM_DIR_NAME}\") -add_definitions(-DSF_DCF_FILE_NAME_PREFIX=\"${SF_DCF_FILE_NAME_PREFIX}\") +# add_definitions(-DCONFIG_FILE_PATH=\"${CONFIG_FILE_PATH}\") # Config message of libs on board # unset(MAIN_INCLUDE_PATH CACHE) @@ -124,18 +84,5 @@ message("MAIN_LINK_LIB = ${MAIN_LINK_LIB}") add_subdirectory(test) # include(build/global_config.cmake) -# add_custom_target( -# IPCSDK_libs -# COMMAND rm -rf ${LIBS_OUTPUT_PATH}/include -# COMMAND rm -rf ${LIBS_OUTPUT_PATH}/readme -# COMMAND mkdir ${LIBS_OUTPUT_PATH}/include -# COMMAND mkdir ${LIBS_OUTPUT_PATH}/readme -# COMMAND make network_module_tools -# COMMAND make ConfigOutput -# COMMAND make FtpManagerOutput -# COMMAND make AtManagerOutput -# COMMAND make LogOutput -# WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ -# ) diff --git a/build/global_config.cmake b/build/global_config.cmake index efb4faac..e286a85f 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -1,18 +1,13 @@ -# 根据实际平台修改 TARGET_PLATFORM 的定义 - -# set(TARGET_PLATFORM "linux") -set(DEFINE_LINUX "linux") -set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR}") -set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPCSDK}") -set(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/out/bin") -set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/out/libs") -set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/out/test") +set(DEFINE_LINUX "linux") +set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR}") +set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPCSDK}") +set(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/out/bin") +set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/out/libs") +set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/out/test") set(PROJECT_ROOT_PATH "${PLATFORM_PATH}") set(APPLICATION_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/application") -set(COMPONENT_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/component") set(UTILS_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/utils") set(HAL_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/hal") set(TEST_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/test") set(EXTERNAL_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/external") -set(DEPENDENCY_LIBS_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/lib") diff --git a/build/sdk_config.cmake b/build/sdk_config.cmake index e8592b4a..f0268b3c 100755 --- a/build/sdk_config.cmake +++ b/build/sdk_config.cmake @@ -1,4 +1,3 @@ -# 提供给项目使用的配置文件 include(${CMAKE_SOURCE_DIR}${SUBMODULE_PATH_OF_IPCSDK}/build/global_config.cmake) # Gdb debug if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) diff --git a/external/gtest/build_gtest.sh b/external/gtest/build_gtest.sh index 1621e3fa..9966b732 100644 --- a/external/gtest/build_gtest.sh +++ b/external/gtest/build_gtest.sh @@ -21,11 +21,6 @@ if [ ! -f "./googletest-release-1.11.0/googlemock/lib/libgtest.a" ] || [ ! -f ". cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_SOURCE_DIR/build/cmake/toolchain/linux.toolchain.cmake . make ;; - "sigmastart_333DE") - echo "==Compile sigmastart_333DE." - cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_SOURCE_DIR/333DE/build/cmake/toolchain/sigmastart_333DE.toolchain.cmake . - make - ;; *) echo "==Compile gtest v2." cmake -DCMAKE_TOOLCHAIN_FILE=$PLATFORM_SOURCE_DIR/build/cmake/toolchain/linux.toolchain.cmake .