OSDN > Finden Software > lang-tools > SCM > hg > libctools > Commit

lang-tools
Fork
pyrepo
cmake_tools
libcpptools
libctools
libqttools

libctools: Commit

This library contains code that extends and simplifies different operations
for C language based programs.

Compatibility with cmake 2.8.3 now is based on function cmtStringMidToEnd() from cmake_tools

diff -r 92cb16566dd6 -r 545d19f3dea4 .hgsubstate

--- a/.hgsubstate Mon Sep 12 03:55:11 2022 +0300

+++ b/.hgsubstate Mon Sep 12 12:41:56 2022 +0300

		@@ -1,4 +1,4 @@
1		-af311077e119880ac0dbe2aa95a0d60f0684af94 cmake/cmake_tools
	1	+df6c0ac9eec5ec9305fd9087ed00395d296a9b3d cmake/cmake_tools
2	2	5013d507802becd2c434d4dbdafad45c3da5ef23 include/ctools/std/msinttypes
3	3	0556a9e3eb8cef3262acbd7be988447b41b14215 pyrepo
4	4	0b899aec14d3a9abb2bf260ac355f0f28630a6a3 tests/unity

diff -r 92cb16566dd6 -r 545d19f3dea4 tests/CMakeLists.txt

--- a/tests/CMakeLists.txt Mon Sep 12 03:55:11 2022 +0300

+++ b/tests/CMakeLists.txt Mon Sep 12 12:41:56 2022 +0300

		@@ -21,6 +21,8 @@
21	21	include_directories(include)
22	22	include_directories(unity/src)
23	23
	24	+include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/cmake_tools/tools/string.cmake)
	25	+
24	26	function(generateTest headers dirs)
25	27	#message("headers:")
26	28	#message("${headers}")

		@@ -64,19 +66,12 @@
64	66	endif()
65	67
66	68	if (NOT "${RELATIVE_NAME}" STREQUAL "")
67		- string(LENGTH "${RELATIVE_NAME}" RELATIVE_NAME_LENGTH)
68		- #message("RELATIVE_NAME_LENGTH")
69		- #message("${RELATIVE_NAME_LENGTH}")
	69	+ cmtStringMidToEnd(${RELATIVE_NAME} 1)
70	70
71		- math(EXPR RELATIVE_PREFIX_LENGTH "${RELATIVE_NAME_LENGTH} - 1")
72		- #message("RELATIVE_PREFIX_LENGTH")
73		- #message("${RELATIVE_PREFIX_LENGTH}")
	71	+ #message("CMT_STRING_MID_TO_END")
	72	+ #message("${CMT_STRING_MID_TO_END}")
74	73
75		- string(SUBSTRING "${RELATIVE_NAME}" 1 ${RELATIVE_PREFIX_LENGTH} RELATIVE_PREFIX)
76		- #message("relative prefix:")
77		- #message("${RELATIVE_PREFIX}")
78		-
79		- set(TEST_NAME "${RELATIVE_PREFIX}_${TEST_NAME}")
	74	+ set(TEST_NAME "${CMT_STRING_MID_TO_END}_${TEST_NAME}")
80	75	#message("test name:")
81	76	#message("${TEST_NAME}")
82	77	endif()