From cdcd317a58d62271c4bd451ca9e33c853f87dd21 Mon Sep 17 00:00:00 2001 From: shuoguozhang Date: Thu, 27 Jul 2023 22:44:41 +0200 Subject: [PATCH] modify the cmakelist --- .../test_2d_water_entry_exit/CMakeLists.txt | 25 +++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/tests/user_examples/test_2d_water_entry_exit/CMakeLists.txt b/tests/user_examples/test_2d_water_entry_exit/CMakeLists.txt index c5a2b97b95..6cf993eaca 100644 --- a/tests/user_examples/test_2d_water_entry_exit/CMakeLists.txt +++ b/tests/user_examples/test_2d_water_entry_exit/CMakeLists.txt @@ -1,25 +1,36 @@ -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) # main (top) cmake dir +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SPHINXSYS_PROJECT_DIR}/cmake) # main (top) cmake dir set(CMAKE_VERBOSE_MAKEFILE on) STRING( REGEX REPLACE ".*/(.*)" "\\1" CURRENT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR} ) PROJECT("${CURRENT_FOLDER}") + + SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) SET(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin/") SET(BUILD_INPUT_PATH "${EXECUTABLE_OUTPUT_PATH}/input") SET(BUILD_RELOAD_PATH "${EXECUTABLE_OUTPUT_PATH}/reload") - file(MAKE_DIRECTORY ${BUILD_INPUT_PATH}) execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${BUILD_INPUT_PATH}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/regression_test_tool/ DESTINATION ${BUILD_INPUT_PATH}) aux_source_directory(. DIR_SRCS) -add_executable(${PROJECT_NAME} ${EXECUTABLE_OUTPUT_PATH} ${DIR_SRCS} ) -set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}") -target_link_libraries(${PROJECT_NAME} extra_sources_2d) +ADD_EXECUTABLE(${PROJECT_NAME} ${DIR_SRCS}) -add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --r=true WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) -add_test(NAME ${PROJECT_NAME}_restart COMMAND ${PROJECT_NAME} --restart_step=4000 + add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --r=false --i=true WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) +else() + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh + DESTINATION ${EXECUTABLE_OUTPUT_PATH}) + add_test(NAME ${PROJECT_NAME} COMMAND bash ${EXECUTABLE_OUTPUT_PATH}/run_test.sh + WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) +endif() + +set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "periodic boundary") + +set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}") +target_link_libraries(${PROJECT_NAME} sphinxsys_2d)