Skip to content
Snippets Groups Projects
Commit 0e1147cc authored by Dilawar Singh's avatar Dilawar Singh
Browse files

Using pip to uninstall the moose-python. Also using cmake -P to install

generated target rather than running make install.
parent 1cf48e5b
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ add_custom_command(OUTPUT ${OUTPUT_MOOSEBIN} ${OUTPUT_MOOSESDIST} ...@@ -19,6 +19,7 @@ add_custom_command(OUTPUT ${OUTPUT_MOOSEBIN} ${OUTPUT_MOOSESDIST}
WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR} WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR}
VERBATIM VERBATIM
) )
add_custom_target(moose-all ALL add_custom_target(moose-all ALL
DEPENDS ${OUTPUT_MOOSESDIST} ${OUTPUT_MOOSEBIN} DEPENDS ${OUTPUT_MOOSESDIST} ${OUTPUT_MOOSEBIN}
) )
...@@ -28,7 +29,7 @@ install(CODE ...@@ -28,7 +29,7 @@ install(CODE
execute_process(COMMAND ctest --output-on-failure execute_process(COMMAND ctest --output-on-failure
WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR}) WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR})
execute_process(COMMAND make install execute_process(COMMAND ${CMAKE_COMMAND} -P cmake_install.cmake
WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR}) WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR})
" "
) )
...@@ -53,6 +54,8 @@ add_custom_target(uninstall ...@@ -53,6 +54,8 @@ add_custom_target(uninstall
add_custom_command(OUTPUT __uninstall_moose-core__ add_custom_command(OUTPUT __uninstall_moose-core__
COMMAND xargs rm -rf < install_manifest.txt COMMAND xargs rm -rf < install_manifest.txt
COMMAND pip uninstall -y moose
COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_INSTALL_PREFIX}/bin/moose.bin
) )
add_custom_command(OUTPUT __uninstall_moose-gui__ add_custom_command(OUTPUT __uninstall_moose-gui__
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment