Manta Interactive Ray Tracer Development Mailing List

Text archives Help


[Manta] Fwd: r429 - in code/Manta-project: . CMake python src


Chronological Thread 
  • From: Abe Stephens <abe@sci.utah.edu>
  • To: "'manta@sci.utah.edu'" <manta@sci.utah.edu>
  • Subject: [Manta] Fwd: r429 - in code/Manta-project: . CMake python src
  • Date: Tue, 27 Nov 2007 13:04:24 -0700

I've updated the Manta-project template to reflect the removal of the SCIRun dependency. Since this project is a source code template that users make a copy of (hopefully an "svn cp") it is possible to merge these changes into existing projects. The most relevant file is CMake/FindManta.cmake:

  1. Determine the checkout date in your own copy. Assuming that you didn't modify the file it should be the Last Changed Date. If the file was modified locally then you'll need to look at the svn log in your repository:
    svn info CMake/FindManta.cmake 
    Path: CMake/FindManta.cmake
    Name: FindManta.cmake
    URL: https://your_separate_repository/CMake/FindManta.cmake
    ...
    Last Changed Date: 2007-06-29 18:41:11 -0600 (Fri, 29 Jun 2007)
    ...
  2. Merge changes from after the last changed date from the Manta-project repository into your own repository:
    svn merge -r "{2007-06-29 18:41:11 -0600}":HEAD https://code.sci.utah.edu/svn/people/abe/code/Manta-project/CMake/FindManta.cmake CMake/FindManta.cmake

If you checked out the source code but didn't make a copy you should be able to just "svn update", likewise if you made a non-svn copy you should be able to check out a new version and copy it over (and manage any conflicts by hand).

Abe

Begin forwarded message:

Date: November 27, 2007 12:39:21 PM MST
Subject: r429 - in code/Manta-project: . CMake python src

Author: abe
Date: Tue Nov 27 12:39:21 2007
New Revision: 429

Removed:
  code/Manta-project/python/objviewer.py
Modified:
  code/Manta-project/CMake/FindManta.cmake
  code/Manta-project/CMakeLists.txt
  code/Manta-project/src/ExampleTexture.cc
Log:

Updated Manta-project to build with Manta @ r1879

Removed SCIRun dependency.
M    CMake/FindManta.cmake
M    src/ExampleTexture.cc

This file exists in the Manta trunk at SwigInterface/objviewer.py
D    python/objviewer.py

Updated python path script output.
M    CMakeLists.txt


Modified: code/Manta-project/CMake/FindManta.cmake
==============================================================================
--- code/Manta-project/CMake/FindManta.cmake (original)
+++ code/Manta-project/CMake/FindManta.cmake Tue Nov 27 12:39:21 2007
@@ -16,8 +16,6 @@
  # Set the include and link variables.
  SET(MANTA_INCLUDE
    ${MANTA_SOURCE_DIR}
-    ${MANTA_SOURCE_DIR}/SCIRun
-    ${MANTA_SOURCE_DIR}/SCIRun/include
    ${MANTA_BUILD_PREFIX}/include
    )

@@ -30,7 +28,6 @@
    Manta_Interface
    Manta_Core_XUtils
    Manta_Core
-    SCIRun_Core
    About
    )


Modified: code/Manta-project/CMakeLists.txt
==============================================================================
--- code/Manta-project/CMakeLists.txt (original)
+++ code/Manta-project/CMakeLists.txt Tue Nov 27 12:39:21 2007
@@ -110,4 +110,6 @@

# Output a helper script for setting up path variables.
FILE(WRITE ${CMAKE_BINARY_DIR}/bin/pythonpath.csh
-  "setenv PYTHONPATH ${MANTA_LINK_DIRECTORIES}:${CMAKE_BINARY_DIR}/lib\n\n")
+  "setenv PYTHONPATH ${MANTA_SOURCE_DIR}/SwigInterface:${MANTA_LINK_DIRECTORIES}:${CMAKE_BINARY_DIR}/lib\n\n")
+FILE(WRITE ${CMAKE_BINARY_DIR}/bin/pythonpath.sh
+  "export PYTHONPATH=${MANTA_SOURCE_DIR}/SwigInterface:${MANTA_LINK_DIRECTORIES}:${CMAKE_BINARY_DIR}/lib\n\n")

Modified: code/Manta-project/src/ExampleTexture.cc
==============================================================================
--- code/Manta-project/src/ExampleTexture.cc (original)
+++ code/Manta-project/src/ExampleTexture.cc Tue Nov 27 12:39:21 2007
@@ -32,7 +32,7 @@

#include <ExampleTexture.h>

-#include <SCIRun/Core/Math/Trig.h>
+#include <Core/Math/Trig.h>

using namespace Manta;



  • [Manta] Fwd: r429 - in code/Manta-project: . CMake python src, Abe Stephens, 11/27/2007

Archive powered by MHonArc 2.6.16.

Top of page