Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[35] trunk
|
From: <he...@us...> - 2009-01-24 14:34:04
|
Revision: 35
http://simspark.svn.sourceforge.net/simspark/?rev=35&view=rev
Author: hedayat
Date: 2009-01-24 14:33:54 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
Added 'make uninstall' support
Do not build documentation by default. (needs using 'make pdf' and 'make doc')
Modified Paths:
--------------
trunk/rcssserver3d/CMakeLists.txt
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/cmake/UseLATEX.cmake
trunk/rcssserver3d/doc/users/CMakeLists.txt
trunk/rsgedit/CMakeLists.txt
trunk/simspark-utilities/CMakeLists.txt
trunk/spark/CMakeLists.txt
trunk/spark/ChangeLog
trunk/spark/cmake/UseLATEX.cmake
trunk/spark/doc/devel/CMakeLists.txt
Added Paths:
-----------
trunk/rcssserver3d/cmake_uninstall.cmake.in
trunk/rsgedit/cmake_uninstall.cmake.in
trunk/simspark-utilities/cmake_uninstall.cmake.in
trunk/spark/cmake_uninstall.cmake.in
Modified: trunk/rcssserver3d/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -62,6 +62,15 @@
install(FILES ${CMAKE_BINARY_DIR}/rcssserver3d_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/ChangeLog 2009-01-24 14:33:54 UTC (rev 35)
@@ -1,3 +1,14 @@
+2009-01-24 Hedayat Vatankhah <he...@gr...>
+
+ * CMakeLists.txt:
+ * cmake_uninstall.cmake.in:
+ - added 'make uninstall' support
+
+ * doc/users/CMakeLists.txt:
+ * cmake/UseLATEX.cmake:
+ - do not build users-manual.pdf by default. can be built using 'make pdf'
+ - add an output to tell the user how it can build the manual
+
2009-01-20 Hedayat Vatankhah <he...@gr...>
* rcssmonitor3d/Makefile.am:
Modified: trunk/rcssserver3d/cmake/UseLATEX.cmake
===================================================================
--- trunk/rcssserver3d/cmake/UseLATEX.cmake 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/cmake/UseLATEX.cmake 2009-01-24 14:33:54 UTC (rev 35)
@@ -681,7 +681,7 @@
IF (PDFLATEX_COMPILER)
IF (LATEX_DEFAULT_PDF)
- ADD_CUSTOM_TARGET(${pdf_target} ALL ${make_pdf_command}
+ ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
DEPENDS ${make_pdf_depends})
ELSE (LATEX_DEFAULT_PDF)
ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
Added: trunk/rcssserver3d/cmake_uninstall.cmake.in
===================================================================
--- trunk/rcssserver3d/cmake_uninstall.cmake.in (rev 0)
+++ trunk/rcssserver3d/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/rcssserver3d/doc/users/CMakeLists.txt
===================================================================
--- trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rcssserver3d/doc/users/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -8,6 +8,9 @@
overview.tex simulations.tex definitions.tex resources.tex user-manual.tex
BIBFILES references.bib IMAGE_DIRS fig DEFAULT_PDF)
endif (PDFLATEX_COMPILER)
+ add_custom_target(pdfcomment ALL echo '***'
+ COMMAND echo '*** To \(re-\)build the users manual, use \"make pdf\"'
+ COMMAND echo '***')
else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/user-manual.tex)
add_custom_target(comment2 ALL echo '***'
COMMAND echo '*** The users manual \(PDF\) can be found in doc/users.'
Modified: trunk/rsgedit/CMakeLists.txt
===================================================================
--- trunk/rsgedit/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/rsgedit/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -54,6 +54,15 @@
install(FILES ${CMAKE_BINARY_DIR}/rsgedit_config.h
DESTINATION ${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
Added: trunk/rsgedit/cmake_uninstall.cmake.in
===================================================================
--- trunk/rsgedit/cmake_uninstall.cmake.in (rev 0)
+++ trunk/rsgedit/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/simspark-utilities/CMakeLists.txt
===================================================================
--- trunk/simspark-utilities/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/simspark-utilities/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -38,6 +38,15 @@
install(FILES AUTHORS ChangeLog COPYING README
DESTINATION ${DATADIR}/doc/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES /CVS/ /[.]svn/ /.*[.]o /[.].*)
Added: trunk/simspark-utilities/cmake_uninstall.cmake.in
===================================================================
--- trunk/simspark-utilities/cmake_uninstall.cmake.in (rev 0)
+++ trunk/simspark-utilities/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/spark/CMakeLists.txt
===================================================================
--- trunk/spark/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -141,6 +141,15 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sparkconfig.h DESTINATION
${INCLUDEDIR}/${CMAKE_PROJECT_NAME})
+########### uninstall support ############
+CONFIGURE_FILE(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+ADD_CUSTOM_TARGET(uninstall
+ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
########### CPack section #############
set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_SOURCE_IGNORE_FILES
Modified: trunk/spark/ChangeLog
===================================================================
--- trunk/spark/ChangeLog 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/ChangeLog 2009-01-24 14:33:54 UTC (rev 35)
@@ -1,3 +1,14 @@
+2009-01-24 Hedayat Vatankhah <he...@gr...>
+
+ * cmake_uninstall.cmake.in:
+ * CMakeLists.txt:
+ - added 'make uninstall' support
+
+ * cmake/UseLATEX.cmake:
+ * doc/devel/CMakeLists.txt:
+ - do not build manual.pdf by default. can be built using 'make pdf'
+ - add an output to tell the user how it can build the manual
+
2009-01-21 Hedayat Vatankhah <he...@gr...>
* CMakeLists.txt:
Modified: trunk/spark/cmake/UseLATEX.cmake
===================================================================
--- trunk/spark/cmake/UseLATEX.cmake 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/cmake/UseLATEX.cmake 2009-01-24 14:33:54 UTC (rev 35)
@@ -681,7 +681,7 @@
IF (PDFLATEX_COMPILER)
IF (LATEX_DEFAULT_PDF)
- ADD_CUSTOM_TARGET(${pdf_target} ALL ${make_pdf_command}
+ ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
DEPENDS ${make_pdf_depends})
ELSE (LATEX_DEFAULT_PDF)
ADD_CUSTOM_TARGET(${pdf_target} ${make_pdf_command}
Added: trunk/spark/cmake_uninstall.cmake.in
===================================================================
--- trunk/spark/cmake_uninstall.cmake.in (rev 0)
+++ trunk/spark/cmake_uninstall.cmake.in 2009-01-24 14:33:54 UTC (rev 35)
@@ -0,0 +1,22 @@
+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+STRING(REGEX REPLACE "\n" ";" files "${files}")
+FOREACH(file ${files})
+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ IF(EXISTS "$ENV{DESTDIR}${file}")
+ EXEC_PROGRAM(
+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
+ OUTPUT_VARIABLE rm_out
+ RETURN_VALUE rm_retval
+ )
+ IF(NOT "${rm_retval}" STREQUAL 0)
+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
+ENDFOREACH(file)
+
Modified: trunk/spark/doc/devel/CMakeLists.txt
===================================================================
--- trunk/spark/doc/devel/CMakeLists.txt 2009-01-22 19:23:39 UTC (rev 34)
+++ trunk/spark/doc/devel/CMakeLists.txt 2009-01-24 14:33:54 UTC (rev 35)
@@ -8,3 +8,7 @@
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"definitions.aux;manual.log;manual.pdf;manual.aux;manual.out;manual.toc")
+
+add_custom_target(pdfcomment ALL echo '***'
+ COMMAND echo '*** To \(re-\)build the developers manual, use \"make pdf\"'
+ COMMAND echo '***')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|