Skip to content

Commit 913f7d5

Browse files
committed
create NBL_TEST_MODULE_INSTALL_FILE function, add install rules for test module's main & interface scripts and .vscode's files, update tests submodule and perform tests with cpack
1 parent 0bbbec4 commit 913f7d5

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

cmake/common.cmake

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
226226
)
227227
endif()
228228

229-
nbl_project_handle_json_config()
229+
nbl_project_process_test_module()
230230
endmacro()
231231

232232
macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUDES LIB_OPTIONS DEF_OPTIONS)
@@ -533,7 +533,14 @@ function(nbl_install_config_header _CONF_HDR_NAME)
533533
install(FILES ${file_relWithDebInfo} DESTINATION relwithdebinfo/include CONFIGURATIONS RelWithDebInfo)
534534
endfunction()
535535

536-
function(nbl_project_handle_json_config)
536+
function(NBL_TEST_MODULE_INSTALL_FILE _NBL_FILEPATH_)
537+
file(RELATIVE_PATH _NBL_REL_INSTALL_DEST_ "${NBL_ROOT_PATH}" "${_NBL_FILEPATH_}")
538+
cmake_path(GET _NBL_REL_INSTALL_DEST_ PARENT_PATH _NBL_REL_INSTALL_DEST_)
539+
540+
nbl_install_media_spec("${_NBL_FILEPATH_}" "${_NBL_REL_INSTALL_DEST_}")
541+
endfunction()
542+
543+
function(nbl_project_process_test_module)
537544
set(NBL_TEMPLATE_JSON_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
538545
get_filename_component(NBL_TEMPLATE_JSON_DIR_ABS_ "${NBL_TEMPLATE_JSON_DIR}" ABSOLUTE)
539546
set(NBL_PROFILES_JSON_DIR "${NBL_TEMPLATE_JSON_DIR}/.profiles")
@@ -595,10 +602,7 @@ function(nbl_project_handle_json_config)
595602
string(FIND "${_NBL_JSON_DEPENDENCY_FILEPATH_ABS_}" "${NBL_MEDIA_DIRECTORY_ABS}" _NBL_IS_MEDIA_DEPENDNECY_)
596603

597604
if(NOT "${_NBL_IS_MEDIA_DEPENDNECY_}" STREQUAL "-1") # filter dependencies, only those coming from NBL_MEDIA_DIRECTORY_ABS are considered for install rules
598-
file(RELATIVE_PATH _NBL_JSON_DEPENDNECY_REL_INSTALL_DEST_ "${NBL_ROOT_PATH}" "${_NBL_JSON_DEPENDENCY_FILEPATH_}")
599-
cmake_path(GET _NBL_JSON_DEPENDNECY_REL_INSTALL_DEST_ PARENT_PATH _NBL_JSON_DEPENDNECY_REL_INSTALL_DEST_)
600-
601-
nbl_install_media_spec("${_NBL_JSON_DEPENDENCY_FILEPATH_}" "${_NBL_JSON_DEPENDNECY_REL_INSTALL_DEST_}")
605+
NBL_TEST_MODULE_INSTALL_FILE("${_NBL_JSON_DEPENDENCY_FILEPATH_}")
602606
endif()
603607
endforeach()
604608
endif()
@@ -703,6 +707,8 @@ function(nbl_project_handle_json_config)
703707
endif()
704708
endif()
705709

710+
NBL_TEST_MODULE_INSTALL_FILE("${_NBL_JSON_SCRIPTPATH_ABS_}")
711+
706712
# ".enableParallelBuild" boolean
707713
NBL_JSON_READ_VALIDATE_POPULATE("" enableParallelBuild BOOLEAN "${_NBL_JSON_TOP_CONFIG_CONTENT_}")
708714

@@ -723,10 +729,14 @@ function(nbl_project_handle_json_config)
723729
set(NBL_RUNALLTESTS_SCRIPT_FILEPATH "${NBL_TEMPLATE_JSON_DIR}/${NBL_RUNALLTESTS_SCRIPT_FILENAME}")
724730
configure_file("${NBL_PYTHON_FRAMEWORK_RUNALLTESTS_SCRIPT_ABS}" "${NBL_RUNALLTESTS_SCRIPT_FILEPATH}" @ONLY)
725731
NBL_JSON_UPDATE_RELATIVE_REFERENCE_FILEPATH("${_NBL_JSON_CONFIG_FILEPATH_}" _NBL_GEN_JSON_TOP_CONFIG_CONTENT_ "${_NBL_JSON_TOP_CONFIG_CONTENT_}" scriptPath)
726-
732+
NBL_TEST_MODULE_INSTALL_FILE("${NBL_RUNALLTESTS_SCRIPT_FILEPATH}")
733+
727734
configure_file("${NBL_PYTHON_FRAMEWORK_VS_LAUNCH_JSON_ABS}" "${NBL_TEMPLATE_JSON_DIR}/.vscode/launch.json" @ONLY)
728735
configure_file("${NBL_PYTHON_FRAMEWORK_VS_SETTINGS_JSON_ABS}" "${NBL_TEMPLATE_JSON_DIR}/.vscode/settings.json" @ONLY)
729736

737+
NBL_TEST_MODULE_INSTALL_FILE("${NBL_TEMPLATE_JSON_DIR}/.vscode/launch.json")
738+
NBL_TEST_MODULE_INSTALL_FILE("${NBL_TEMPLATE_JSON_DIR}/.vscode/settings.json")
739+
730740
target_sources(${EXECUTABLE_NAME} PUBLIC "${NBL_RUNALLTESTS_SCRIPT_FILEPATH}")
731741
source_group("${NBL_PFT_SOURCE_GROUP_NAME}/target" FILES "${NBL_RUNALLTESTS_SCRIPT_FILEPATH}")
732742

@@ -939,13 +949,10 @@ function(nbl_project_handle_json_config)
939949
target_sources(${EXECUTABLE_NAME} PUBLIC "${_NBL_JSON_PROFILE_OUTPUT_FILEPATH_}")
940950
source_group("${NBL_PFT_SOURCE_GROUP_NAME}/target/JSON/Auto-Gen Profiles" FILES "${_NBL_JSON_PROFILE_OUTPUT_FILEPATH_}")
941951

942-
file(RELATIVE_PATH _NBL_JSON_PROFILE_REL_INSTALL_DEST_ "${NBL_ROOT_PATH}" "${_NBL_JSON_PROFILE_OUTPUT_FILEPATH_}")
943-
cmake_path(GET _NBL_JSON_PROFILE_REL_INSTALL_DEST_ PARENT_PATH _NBL_JSON_PROFILE_REL_INSTALL_DEST_)
944-
945-
nbl_install_media_spec("${_NBL_JSON_PROFILE_OUTPUT_FILEPATH_}" "${_NBL_JSON_PROFILE_REL_INSTALL_DEST_}")
952+
NBL_TEST_MODULE_INSTALL_FILE("${_NBL_JSON_PROFILE_OUTPUT_FILEPATH_}")
946953
endforeach()
947954
endif()
948-
955+
949956
NBL_TARGET_ATTACH_PYTHON_FRAMEWORK("${EXECUTABLE_NAME}")
950957
endif()
951958
endfunction()

tests

Submodule tests updated 1 file

0 commit comments

Comments
 (0)