From: Jonathan S. <jjs...@us...> - 2006-10-23 01:01:38
|
Update of /cvsroot/octaviz/octaviz In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31562 Modified Files: CMakeLists.txt Added Files: cmake_uninstall.cmake.in Log Message: patches for vtk 5 and gcc 4.1 Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/octaviz/octaviz/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- CMakeLists.txt 28 Oct 2004 01:58:52 -0000 1.3 +++ CMakeLists.txt 23 Oct 2006 01:01:33 -0000 1.4 @@ -3,6 +3,16 @@ PROJECT(OCTAVIZ) + ## added from cmake FAQ, JJS 3/29/05; also needs the file cmake_uninstall.cmake.in + 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") + ## + OPTION(USE_PREC_HEADERS "Use precompiled headers" OFF) STRING(COMPARE EQUAL ${USE_PREC_HEADERS} "OFF" PCH_ON) IF(PCH_ON) @@ -82,7 +92,15 @@ INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake) - + + # what we don't want or can't build; + # this is an ugly hack[TM] and should be fixed by e.g. + # including a list of not-to-be-built-functions shipped with + # Octaviz + SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1) + SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1) + SET(all_oct) FOREACH(class ${VTK_${ukit}_CLASSES}) IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class}) --- NEW FILE: cmake_uninstall.cmake.in --- 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 \"${file}\"") IF(NOT EXISTS "${file}") MESSAGE(FATAL_ERROR "File \"${file}\" does not exists.") ENDIF(NOT EXISTS "${file}") EXEC_PROGRAM("@CMAKE_COMMAND@" ARGS "-E remove \"${file}\"" OUTPUT_VARIABLE rm_out RETURN_VARIABLE rm_retval) IF("${rm_retval}" GREATER 0) MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"") ENDIF("${rm_retval}" GREATER 0) ENDFOREACH(file) |