Remove EthUtils.cmake

cmake/EthUtils.cmake

@@ -1,81 +0,0 @@
-#
-# renames the file if it is different from its destination
-include(CMakeParseArguments)
-#
-macro(replace_if_different SOURCE DST)
-	set(extra_macro_args ${ARGN})
-	set(options CREATE)
-	set(one_value_args)
-	set(multi_value_args)
-	cmake_parse_arguments(REPLACE_IF_DIFFERENT "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
-
-	if (REPLACE_IF_DIFFERENT_CREATE AND (NOT (EXISTS "${DST}")))
-		file(WRITE "${DST}" "")
-	endif()
-
-	execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files "${SOURCE}" "${DST}" RESULT_VARIABLE DIFFERENT)
-
-	if (DIFFERENT)
-		execute_process(COMMAND ${CMAKE_COMMAND} -E rename "${SOURCE}" "${DST}")
-	else()
-		execute_process(COMMAND ${CMAKE_COMMAND} -E remove "${SOURCE}")
-	endif()
-endmacro()
-
-macro(eth_add_test NAME) 
-
-	# parse arguments here
-	set(commands)
-	set(current_command "")
-	foreach (arg ${ARGN})
-		if (arg STREQUAL "ARGS")
-			if (current_command)
-				list(APPEND commands ${current_command})
-			endif()
-			set(current_command "")
-		else ()
-			set(current_command "${current_command} ${arg}")
-		endif()
-	endforeach(arg)
-	list(APPEND commands ${current_command})
-
-	message(STATUS "test: ${NAME} | ${commands}")
-
-	# create tests
-	set(index 0)
-	list(LENGTH commands count)
-	while (index LESS count)
-		list(GET commands ${index} test_arguments)
-
-		set(run_test "--run_test=${NAME}")
-		add_test(NAME "${NAME}.${index}" COMMAND testeth ${run_test} ${test_arguments})
-		
-		math(EXPR index "${index} + 1")
-	endwhile(index LESS count)
-
-	# add target to run them
-	add_custom_target("test.${NAME}"
-		DEPENDS testeth
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		COMMAND ${CMAKE_COMMAND} -DETH_TEST_NAME="${NAME}" -DCTEST_COMMAND="${CTEST_COMMAND}" -P "${ETH_SCRIPTS_DIR}/runtest.cmake"
-	)
-
-endmacro()
-
-# Creates C resources file from files
-function(eth_add_resources RESOURCE_FILE OUT_FILE)
-	include("${RESOURCE_FILE}")
-	set(OUTPUT  "${ETH_RESOURCE_LOCATION}/${ETH_RESOURCE_NAME}.hpp")
-	set(${OUT_FILE} "${OUTPUT}"  PARENT_SCOPE)
-
-	set(filenames "${RESOURCE_FILE}")
-	list(APPEND filenames "${ETH_SCRIPTS_DIR}/resources.cmake")
-	foreach(resource ${ETH_RESOURCES})
-		list(APPEND filenames "${${resource}}")
-	endforeach(resource)
-
-	add_custom_command(OUTPUT ${OUTPUT}
-		COMMAND ${CMAKE_COMMAND} -DETH_RES_FILE="${RESOURCE_FILE}" -P "${ETH_SCRIPTS_DIR}/resources.cmake"
-		DEPENDS ${filenames}
-	)
-endfunction()

cmake/scripts/buildinfo.cmake

@@ -23,5 +23,24 @@ set(OUTFILE "${ETH_DST_DIR}/BuildInfo.h")
 
 configure_file("${INFILE}" "${TMPFILE}")
 
-include("${ETH_SOURCE_DIR}/cmake/EthUtils.cmake")
+
+macro(replace_if_different SOURCE DST)
+	set(extra_macro_args ${ARGN})
+	set(options CREATE)
+	set(one_value_args)
+	set(multi_value_args)
+	cmake_parse_arguments(REPLACE_IF_DIFFERENT "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
+
+	if (REPLACE_IF_DIFFERENT_CREATE AND (NOT (EXISTS "${DST}")))
+		file(WRITE "${DST}" "")
+	endif()
+
+	execute_process(COMMAND ${CMAKE_COMMAND} -E compare_files "${SOURCE}" "${DST}" RESULT_VARIABLE DIFFERENT)
+
+	if (DIFFERENT)
+		execute_process(COMMAND ${CMAKE_COMMAND} -E rename "${SOURCE}" "${DST}")
+	else()
+		execute_process(COMMAND ${CMAKE_COMMAND} -E remove "${SOURCE}")
+	endif()
+endmacro()
 replace_if_different("${TMPFILE}" "${OUTFILE}" CREATE)