mirror of
				https://gitee.com/jiuyilian/embedded-framework.git
				synced 2025-10-24 18:20:15 -04:00 
			
		
		
		
	Improve external lib build.
This commit is contained in:
		
							parent
							
								
									0f67e707a3
								
							
						
					
					
						commit
						5d06d53ace
					
				| 
						 | 
				
			
			@ -5,6 +5,34 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TEST_LINUX_MOCK}")
 | 
			
		|||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TEST_LINUX_MOCK}")
 | 
			
		||||
# Compile gtest for test code.
 | 
			
		||||
execute_process(COMMAND sh build_gtest.sh ${TARGET_PLATFORM} ${PLATFORM_PATH} ${PLATFORM_PATH} WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/)
 | 
			
		||||
execute_process(COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgtest.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a 
 | 
			
		||||
                WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/)
 | 
			
		||||
execute_process(COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgmock.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a 
 | 
			
		||||
                WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/)
 | 
			
		||||
 | 
			
		||||
# build gtest and gmock
 | 
			
		||||
# add_custom_command(
 | 
			
		||||
#     OUTPUT ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a
 | 
			
		||||
#     OUTPUT ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a
 | 
			
		||||
#     COMMAND echo "Build google test for test code."
 | 
			
		||||
#     COMMAND sh build_gtest.sh ${TARGET_PLATFORM} ${PLATFORM_PATH} ${PLATFORM_PATH}
 | 
			
		||||
#     COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgtest.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a
 | 
			
		||||
#     COMMAND mv ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib/libgmock.a ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a
 | 
			
		||||
#     WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/gtest/
 | 
			
		||||
# )
 | 
			
		||||
# # add_custom_target(
 | 
			
		||||
# #     google_test
 | 
			
		||||
# #     DEPENDS libgtest.a libgmock.a
 | 
			
		||||
# # )
 | 
			
		||||
# add_custom_target(
 | 
			
		||||
#     libgtest.a
 | 
			
		||||
#     DEPENDS ${EXTERNAL_LIBS_OUTPUT_PATH}/libgtest.a
 | 
			
		||||
# )
 | 
			
		||||
# add_custom_target(
 | 
			
		||||
#     libgmock.a
 | 
			
		||||
#     DEPENDS ${EXTERNAL_LIBS_OUTPUT_PATH}/libgmock.a
 | 
			
		||||
# )
 | 
			
		||||
 | 
			
		||||
# add_subdirectory(test_utils)
 | 
			
		||||
add_subdirectory(middleware)
 | 
			
		||||
add_subdirectory(utils)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,6 @@ include_directories(
 | 
			
		|||
)
 | 
			
		||||
 | 
			
		||||
link_directories(
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${LIBS_OUTPUT_PATH}
 | 
			
		||||
    ${EXTERNAL_LIBS_OUTPUT_PATH}
 | 
			
		||||
)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,9 +10,8 @@ include_directories(
 | 
			
		|||
)
 | 
			
		||||
 | 
			
		||||
link_directories(
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${LIBS_OUTPUT_PATH}
 | 
			
		||||
    ${EXTERNAL_LIBS_OUTPUT_PATH}
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
set(CMAKE_AUTOMOC ON)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,7 +14,6 @@ include_directories(
 | 
			
		|||
)
 | 
			
		||||
 | 
			
		||||
link_directories(
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${LIBS_OUTPUT_PATH}
 | 
			
		||||
    ${EXTERNAL_LIBS_OUTPUT_PATH}
 | 
			
		||||
)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -14,8 +14,6 @@ include_directories(
 | 
			
		|||
)
 | 
			
		||||
message("=========================================${EXTERNAL_LIBS_OUTPUT_PATH}")
 | 
			
		||||
link_directories(
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${LIBS_OUTPUT_PATH}
 | 
			
		||||
    ${EXTERNAL_LIBS_OUTPUT_PATH}
 | 
			
		||||
)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,9 +12,8 @@ include_directories(
 | 
			
		|||
)
 | 
			
		||||
 | 
			
		||||
link_directories(
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${LIBS_OUTPUT_PATH}
 | 
			
		||||
    ${EXTERNAL_LIBS_OUTPUT_PATH}
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
set(CMAKE_AUTOMOC ON)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -11,9 +11,8 @@ include_directories(
 | 
			
		|||
)
 | 
			
		||||
 | 
			
		||||
link_directories(
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googlemock/lib
 | 
			
		||||
    ${LIBS_OUTPUT_PATH}
 | 
			
		||||
    ${EXTERNAL_LIBS_OUTPUT_PATH}
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
set(CMAKE_AUTOMOC ON)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user