Skip to content

Commit

Permalink
Merge pull request #5735 from tjhei/delete-parameter-gui
Browse files Browse the repository at this point in the history
Remove detection and driver for parameter GUI.
  • Loading branch information
gassmoeller authored Oct 9, 2024
2 parents f168159 + 005f0fb commit e4fad72
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 205 deletions.
45 changes: 0 additions & 45 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1006,51 +1006,6 @@ MESSAGE(STATUS "===== Configuring ASPECT documentation =============")

add_subdirectory(doc)


# Find the deal.II parameter GUI and install helper script
find_program(PARAMETER_GUI_EXECUTABLE
parameter_gui
HINTS $ENV{PARAMETER_GUI_DIR} $ENV{PARAMETER_GUI_DIR}/bin ${PARAMETER_GUI_DIR} ${PARAMETER_GUI_DIR}/bin
PATH bin)
mark_as_advanced(CLEAR PARAMETER_GUI_EXECUTABLE)

# Did the user specify something that doesn't exist?
if(PARAMETER_GUI_EXECUTABLE
AND
(NOT EXISTS ${PARAMETER_GUI_EXECUTABLE} OR IS_DIRECTORY ${PARAMETER_GUI_EXECUTABLE}))
message(STATUS "Warning: PARAMETER_GUI_EXECUTABLE '${PARAMETER_GUI_EXECUTABLE}' does not exist")
set(PARAMETER_GUI_EXECUTABLE "PARAMETER_GUI_EXECUTABLE-NOTFOUND" CACHE FILEPATH "" FORCE)
endif()

if(NOT PARAMETER_GUI_EXECUTABLE)
message(STATUS "Parameter GUI not found: install and provide a hint using -D PARAMETER_GUI_DIR or set -D PARAMETER_GUI_EXECUTABLE directly.")
else()
message(STATUS "Found parameter GUI at: ${PARAMETER_GUI_EXECUTABLE}")
configure_file(
${CMAKE_SOURCE_DIR}/doc/aspect-gui
${CMAKE_BINARY_DIR}/aspect-gui
@ONLY
)
install(FILES ${CMAKE_BINARY_DIR}/aspect-gui
DESTINATION bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
endif()



# A target to create parameters.json after building the ASPECT binary.

add_custom_command(TARGET ${TARGET_EXE} POST_BUILD
COMMAND sh -c 'echo "" | ./$<TARGET_PROPERTY:${TARGET_EXE},OUTPUT_NAME> --output-json -- > parameters.json'
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})



message(STATUS "")
message(STATUS "===== Writing final configuration ==================")

include(cmake/write_config)

# print "info" if run for the first time:
Expand Down
1 change: 0 additions & 1 deletion cmake/write_config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ _detailed(
# CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}
# CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} on platform ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR}
# ${CMAKE_CXX_COMPILER}
# PARAMETER_GUI_EXECUTABLE: ${PARAMETER_GUI_EXECUTABLE}
")

if(CMAKE_C_COMPILER_WORKS)
Expand Down
57 changes: 0 additions & 57 deletions doc/aspect-gui

This file was deleted.

6 changes: 6 additions & 0 deletions doc/modules/changes/20240602_tjhei
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Changed: The QT based Parameter GUI has been removed from the ASPECT repository
and the documentation as it was no longer maintained and no longer working
correctly. Instead, use the parameter list linked from the website or edit
directly in Visual Studio Code with the ASPECT plugin.
<br>
(Timo Heister, 2024/06/02)
Binary file removed doc/sphinx/user/run-aspect/gui/images/aspect-gui.png
Binary file not shown.
19 changes: 0 additions & 19 deletions doc/sphinx/user/run-aspect/gui/index.md

This file was deleted.

48 changes: 0 additions & 48 deletions doc/sphinx/user/run-aspect/gui/installing.md

This file was deleted.

34 changes: 0 additions & 34 deletions doc/sphinx/user/run-aspect/gui/using.md

This file was deleted.

1 change: 0 additions & 1 deletion doc/sphinx/user/run-aspect/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ visualizing-results/index.md
checkpoint-restart.md
run-faster/index.md
parameters-overview/index.md
gui/index.md
:::

0 comments on commit e4fad72

Please sign in to comment.