From 0e1147ccadee210de7e323bb454f44c7a6ede295 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Mon, 10 Aug 2015 01:39:36 +0530
Subject: [PATCH] Using pip to uninstall the moose-python. Also using cmake -P
to install generated target rather than running make install.
---
CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35b812ac..8b2aaf93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ add_custom_command(OUTPUT ${OUTPUT_MOOSEBIN} ${OUTPUT_MOOSESDIST}
WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR}
VERBATIM
)
+
add_custom_target(moose-all ALL
DEPENDS ${OUTPUT_MOOSESDIST} ${OUTPUT_MOOSEBIN}
)
@@ -28,7 +29,7 @@ install(CODE
execute_process(COMMAND ctest --output-on-failure
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})
"
)
@@ -53,6 +54,8 @@ add_custom_target(uninstall
add_custom_command(OUTPUT __uninstall_moose-core__
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__
--
GitLab