From 1cf48e5b86f720f4c7fbe0803736019527758496 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Mon, 10 Aug 2015 01:35:05 +0530
Subject: [PATCH] The uninstall happens successfully. Need to test if make
install aslo runs make again.
---
CMakeLists.txt | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aaebcdd2..35b812ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ install(CODE
execute_process(COMMAND ctest --output-on-failure
WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR})
- execute_process(COMMAND ${CMAKE_COMMAND} install
+ execute_process(COMMAND make install
WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR})
"
)
@@ -52,13 +52,11 @@ add_custom_target(uninstall
)
add_custom_command(OUTPUT __uninstall_moose-core__
- COMMAND make uninstall
- WORKING_DIRECTORY ${MOOSE_CORE_BUILD_DIR}
+ COMMAND xargs rm -rf < install_manifest.txt
)
add_custom_command(OUTPUT __uninstall_moose-gui__
COMMAND ${CMAKE_COMMAND} -E remove_directory
- ${CMAKE_INSTALL_PREFIX}/lib/moose
- COMMAND ${CMAKE_COMMAND} -R remove ${CMAKE_INSTALL_PREFIX}/bin/moosegui
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ ${CMAKE_INSTALL_PREFIX}/lib/moose/gui
+ COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_INSTALL_PREFIX}/bin/moosegui
)
--
GitLab