Merge "Enable cmake testing" into main (ff18ea26) · Commits · e / os / android_build_soong

cc/cmake_main.txt

+1 −0

Original line number	Diff line number	Diff line
		cmake_minimum_required(VERSION 3.18)
		project(<<.M.Name>> CXX)
		set(CMAKE_CXX_STANDARD 20)
		enable_testing()

		set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
		include(AddAidlLibrary)

+12 −3

Original line number	Diff line number	Diff line
		@@ -8,15 +8,24 @@
		(getLinkerProperties .M).Header_libs
		(getExtraLibs .M)
		) .Pprop.LibraryMapping>>
		<<$moduleType := getModuleType .M>>
		<<$moduleTypeCmake := "executable">>
		<<if eq $moduleType "library">>
		<<$moduleTypeCmake = "library">>
		<<end>>

		# <<.M.Name>>
		<<if $srcs>>
		<<setList .M.Name "_SRCS" "${ANDROID_BUILD_TOP}/" (toStrings $srcs)>>
		add_<<getModuleType .M>>(<<.M.Name>> ${<<.M.Name>>_SRCS})
		add_<<$moduleTypeCmake>>(<<.M.Name>> ${<<.M.Name>>_SRCS})
		<<- else>>
		add_<<getModuleType .M>>(<<.M.Name>> INTERFACE)
		add_<<$moduleTypeCmake>>(<<.M.Name>> INTERFACE)
		<<- end>>
		<<- if eq $moduleType "library">>
		add_library(android::<<.M.Name>> ALIAS <<.M.Name>>)
		<<- else if eq $moduleType "test">>
		add_test(NAME <<.M.Name>> COMMAND <<.M.Name>>)
		<<- end>>
		add_<<getModuleType .M>>(android::<<.M.Name>> ALIAS <<.M.Name>>)
		<<print "">>

		<<- if $includeDirs>>

+2 −2

Original line number	Diff line number	Diff line
		@@ -488,9 +488,9 @@ func getModuleType(m *Module) string {
		case *libraryDecorator:
		return "library"
		case *testBinary:
		return "executable"
		return "test"
		case *benchmarkDecorator:
		return "executable"
		return "test"
		}
		panic(fmt.Sprintf("Unexpected module type: %T", m.linker))
		}