Skip to content

Commit e3cbf8d

Browse files
mergify[bot]j-rivero
mergify[bot]
and
j-rivero
authored
Reduce example names to be able to run Conda CI on Windows (gz-cmake4) (#476) (#484)
Signed-off-by: Jose Luis Rivero <[email protected]> Signed-off-by: Steve Peters <[email protected]> Co-authored-by: Steve Peters <[email protected]> (cherry picked from commit 1c5630a) Co-authored-by: Jose Luis Rivero <[email protected]>
1 parent f9bbd67 commit e3cbf8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+156
-156
lines changed

‎examples/CMakeLists.txt‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ set(example_directories
2727
gz_conf
2828
no_gz_prefix
2929
prerelease
30-
core_nodep
31-
core_nodep_static
32-
core_child
33-
core_child_private
34-
core_static_child
30+
c_nodep
31+
c_nodep_static
32+
c_child
33+
c_child_private
34+
c_static_child
3535
comp_deps
36-
use_config_ifp
36+
config_ifp
3737
)
3838
if (NOT CMAKE_GENERATOR MATCHES "Visual Studio")
3939
list(APPEND example_directories
40-
use_component_depsA
41-
use_component_depsB
42-
use_component_depsC
40+
comp_depsA
41+
comp_depsB
42+
comp_depsC
4343
)
4444
endif()
4545

@@ -51,30 +51,30 @@ foreach(example ${example_directories})
5151
set(example_tarball_name no_gz_prefix-0.1.0.tar.bz2)
5252
elseif (${example} STREQUAL "prerelease")
5353
set(example_tarball_name gz-minimal-1.0.0~pre1.tar.bz2)
54-
elseif (${example} STREQUAL "core_nodep")
55-
set(example_tarball_name gz-core_no_deps-0.1.0.tar.bz2)
54+
elseif (${example} STREQUAL "c_nodep")
55+
set(example_tarball_name gz-c_no_deps-0.1.0.tar.bz2)
5656
set(run_codecheck true)
57-
elseif (${example} STREQUAL "core_nodep_static")
58-
set(example_tarball_name gz-core_no_deps_static-0.1.0.tar.bz2)
57+
elseif (${example} STREQUAL "c_nodep_static")
58+
set(example_tarball_name gz-c_no_deps_static-0.1.0.tar.bz2)
5959
set(run_codecheck true)
60-
elseif (${example} STREQUAL "core_child")
61-
set(example_tarball_name gz-core_child-0.1.0.tar.bz2)
60+
elseif (${example} STREQUAL "c_child")
61+
set(example_tarball_name gz-c_child-0.1.0.tar.bz2)
6262
set(run_codecheck true)
63-
elseif (${example} STREQUAL "core_child_private")
64-
set(example_tarball_name gz-core_child_private-0.1.0.tar.bz2)
63+
elseif (${example} STREQUAL "c_child_private")
64+
set(example_tarball_name gz-c_child_private-0.1.0.tar.bz2)
6565
set(run_codecheck true)
66-
elseif (${example} STREQUAL "core_static_child")
67-
set(example_tarball_name gz-core_static_child-0.1.0.tar.bz2)
66+
elseif (${example} STREQUAL "c_static_child")
67+
set(example_tarball_name gz-c_static_child-0.1.0.tar.bz2)
6868
set(run_codecheck true)
6969
elseif (${example} STREQUAL "comp_deps")
70-
set(example_tarball_name gz-component_deps-0.1.0.tar.bz2)
71-
elseif (${example} STREQUAL "use_component_depsA")
72-
set(example_tarball_name gz-use_component_depsa-0.1.0.tar.bz2)
73-
elseif (${example} STREQUAL "use_component_depsB")
74-
set(example_tarball_name gz-use_component_depsb-0.1.0.tar.bz2)
75-
elseif (${example} STREQUAL "use_component_depsC")
76-
set(example_tarball_name gz-use_component_depsc-0.1.0.tar.bz2)
77-
elseif (${example} STREQUAL "use_config_ifp")
70+
set(example_tarball_name gz-comp_deps-0.1.0.tar.bz2)
71+
elseif (${example} STREQUAL "comp_depsA")
72+
set(example_tarball_name gz-comp_depsa-0.1.0.tar.bz2)
73+
elseif (${example} STREQUAL "comp_depsB")
74+
set(example_tarball_name gz-comp_depsb-0.1.0.tar.bz2)
75+
elseif (${example} STREQUAL "comp_depsC")
76+
set(example_tarball_name gz-comp_depsc-0.1.0.tar.bz2)
77+
elseif (${example} STREQUAL "config_ifp")
7878
set(example_tarball_name gz-find_config-0.1.0.tar.bz2)
7979

8080
else()
@@ -180,24 +180,24 @@ endforeach()
180180
# need to exist before they can be used there
181181
foreach (build_type ${build_types})
182182
shorten_build_type("${build_type}" short_bt)
183-
add_dependencies(core_child_${short_bt} core_nodep_${short_bt})
184-
add_dependencies(core_child_private_${short_bt} core_nodep_${short_bt})
185-
add_dependencies(core_static_child_${short_bt} core_nodep_static_${short_bt})
186-
if (TARGET use_component_depsA_${short_bt})
187-
add_dependencies(use_component_depsA_${short_bt} comp_deps_${short_bt})
183+
add_dependencies(c_child_${short_bt} c_nodep_${short_bt})
184+
add_dependencies(c_child_private_${short_bt} c_nodep_${short_bt})
185+
add_dependencies(c_static_child_${short_bt} c_nodep_static_${short_bt})
186+
if (TARGET comp_depsA_${short_bt})
187+
add_dependencies(comp_depsA_${short_bt} comp_deps_${short_bt})
188188
endif()
189-
if (TARGET use_component_depsB_${short_bt})
190-
add_dependencies(use_component_depsB_${short_bt} comp_deps_${short_bt})
189+
if (TARGET comp_depsB_${short_bt})
190+
add_dependencies(comp_depsB_${short_bt} comp_deps_${short_bt})
191191
endif()
192-
if (TARGET use_component_depsC_${short_bt})
193-
add_dependencies(use_component_depsC_${short_bt} comp_deps_${short_bt})
192+
if (TARGET comp_depsC_${short_bt})
193+
add_dependencies(comp_depsC_${short_bt} comp_deps_${short_bt})
194194
endif()
195195
endforeach()
196196

197-
# test that core_child pkg-config file requires core_nodep
198-
# and that core_child_private pkg-config file requires core_nodep privately
197+
# test that c_child pkg-config file requires c_nodep
198+
# and that c_child_private pkg-config file requires c_nodep privately
199199
if (UNIX)
200-
set(TEST_NAME core_child_requires_core_nodep)
200+
set(TEST_NAME c_child_requires_c_nodep)
201201
string(TIMESTAMP TEST_TIME)
202202
configure_file(
203203
"${CMAKE_CURRENT_SOURCE_DIR}/junit_pass.xml.in"
@@ -219,7 +219,7 @@ if (UNIX)
219219

220220
list(APPEND _env_vars "PKG_CONFIG_PATH=${example_INSTALL_DIR}/${example_PKGCONFIG_INSTALL_LIBDIR}:${FAKE_INSTALL_PREFIX}/${example_PKGCONFIG_INSTALL_LIBDIR}:$PKG_CONFIG_PATH")
221221
add_test(${TEST_NAME}
222-
${CMAKE_CURRENT_SOURCE_DIR}/test_core_child_requires_core_no_deps.bash
222+
${CMAKE_CURRENT_SOURCE_DIR}/test_c_child_requires_c_no_deps.bash
223223
)
224224
set_tests_properties(${TEST_NAME} PROPERTIES
225225
ENVIRONMENT "${_env_vars}")

examples/core_child/CMakeLists.txt renamed to examples/c_child/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
2-
project(gz-core_child VERSION 0.1.0)
2+
project(gz-c_child VERSION 0.1.0)
33
find_package(gz-cmake3 REQUIRED)
44
gz_configure_project()
5-
gz_find_package(gz-core_no_deps REQUIRED EXTRA_ARGS NAMES gz-core_no_deps)
5+
gz_find_package(gz-c_no_deps REQUIRED EXTRA_ARGS NAMES gz-c_no_deps)
66
gz_configure_build(QUIT_IF_BUILD_ERRORS)
77
gz_create_packages()
88
gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_API_URL}")

examples/core_child/README.md renamed to examples/c_child/README.md

examples/core_child/include/CMakeLists.txt renamed to examples/c_child/include/CMakeLists.txt

File renamed without changes.

examples/core_child/src/CMakeLists.txt renamed to examples/c_child/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ gz_get_libsources_and_unittests(sources gtest_sources)
22
gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
33
target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
44
PUBLIC
5-
gz-core_no_deps::gz-core_no_deps)
5+
gz-c_no_deps::gz-c_no_deps)
66
gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})

examples/core_child/src/empty.cc renamed to examples/c_child/src/empty.cc

File renamed without changes.

examples/core_child/test/CMakeLists.txt renamed to examples/c_child/test/CMakeLists.txt

File renamed without changes.

examples/core_child_private/CMakeLists.txt renamed to examples/c_child_private/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
2-
project(gz-core_child_private VERSION 0.1.0)
2+
project(gz-c_child_private VERSION 0.1.0)
33
find_package(gz-cmake3 REQUIRED)
44
gz_configure_project()
5-
gz_find_package(gz-core_no_deps PRIVATE REQUIRED)
5+
gz_find_package(gz-c_no_deps PRIVATE REQUIRED)
66
gz_configure_build(QUIT_IF_BUILD_ERRORS)
77
gz_create_packages()
88
gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_API_URL}")

examples/core_child_private/README.md renamed to examples/c_child_private/README.md

examples/core_child_private/include/CMakeLists.txt renamed to examples/c_child_private/include/CMakeLists.txt

File renamed without changes.

0 commit comments

Comments
 (0)