Text archives Help

---

Author: bigler
Date: Thu Aug 24 14:52:05 2006
New Revision: 1190

Added:
   trunk/CMake/MantaUseSWIG.cmake
      - copied, changed from r1189, 
trunk/SwigInterface/test/MantaUseSWIG.cmake
   trunk/CMake/empty.depend.in
      - copied unchanged from r1186, trunk/SwigInterface/test/empty.depend.in
   trunk/CMake/make2cmake.py
      - copied unchanged from r1188, trunk/SwigInterface/test/make2cmake.py
Removed:
   trunk/SwigInterface/test/MantaUseSWIG.cmake
   trunk/SwigInterface/test/empty.depend.in
   trunk/SwigInterface/test/make2cmake.py
Modified:
   trunk/SwigInterface/CMakeLists.txt
   trunk/SwigInterface/test/CMakeLists.txt
   trunk/commandlines
Log:

CMake/MantaUseSWIG.cmake
CMake/empty.depend.in
CMake/make2cmake.py
SwigInterface/test/MantaUseSWIG.cmake
SwigInterface/test/empty.depend.in
SwigInterface/test/make2cmake.py

  Moved these from SwigInterface/test to the CMake directory for
  generatl use.  Updated paths to match this.

SwigInterface/CMakeLists.txt

  Use MantaUseSWIG.cmake instead of the system one.

SwigInterface/test/CMakeLists.txt

  Point to the new location of MantaUseSWIG.cmake.

commandlines

  Added command that was used to make the RT06 cover image.


Copied: trunk/CMake/MantaUseSWIG.cmake (from r1189, 
trunk/SwigInterface/test/MantaUseSWIG.cmake)
==============================================================================
--- trunk/SwigInterface/test/MantaUseSWIG.cmake (original)
+++ trunk/CMake/MantaUseSWIG.cmake      Thu Aug 24 14:52:05 2006
@@ -117,7 +117,7 @@
   IF(${CMAKE_MAKE_PROGRAM} MATCHES "make")
     IF(NOT EXISTS ${dependency_file})
       CONFIGURE_FILE(
-        ${CMAKE_SOURCE_DIR}/empty.depend.in
+        ${CMAKE_SOURCE_DIR}/CMake/empty.depend.in
         ${dependency_file} IMMEDIATE)
     ENDIF(NOT EXISTS ${dependency_file})
     # Always include this file to force CMake to run again next
@@ -156,7 +156,7 @@
     SET(MANTA_SWIG_DEPEND ${dependency_file})
     # Force CMake to run again next build
     CONFIGURE_FILE(
-      ${CMAKE_SOURCE_DIR}/empty.depend.in
+      ${CMAKE_SOURCE_DIR}/CMake/empty.depend.in
       ${dependency_file} IMMEDIATE)
   ENDIF(MANTA_SWIG_DEPEND_REGENERATE)
       
@@ -249,7 +249,7 @@
 
   # Add this argument if we need to.
   IF(CMAKE_SWIG_OUTDIR)
-    SET(OUTDIR_ARG "-outdir ${CMAKE_SWIG_OUTDIR}")
+    SET(OUTDIR_ARG "-outdir" "${CMAKE_SWIG_OUTDIR}")
   ELSE(CMAKE_SWIG_OUTDIR)
     SET(OUTDIR_ARG "")
   ENDIF(CMAKE_SWIG_OUTDIR)
@@ -283,7 +283,7 @@
   ADD_CUSTOM_COMMAND(
     OUTPUT ${cmake_dependency_file}
     COMMAND ${PYTHONINTERP}
-    ARGS "${CMAKE_CURRENT_SOURCE_DIR}/make2cmake.py" 
${swig_generated_dependency_file} ${cmake_dependency_file}
+    ARGS "${CMAKE_SOURCE_DIR}/CMake/make2cmake.py" 
${swig_generated_dependency_file} ${cmake_dependency_file}
     MAIN_DEPENDENCY ${swig_generated_dependency_file}
     COMMENT "Converting swig dependency to CMake (${cmake_dependency_file})"
     )

Modified: trunk/SwigInterface/CMakeLists.txt
==============================================================================
--- trunk/SwigInterface/CMakeLists.txt  (original)
+++ trunk/SwigInterface/CMakeLists.txt  Thu Aug 24 14:52:05 2006
@@ -17,7 +17,8 @@
 FIND_PACKAGE(PythonLibs)
 INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
 
-INCLUDE(${SWIG_USE_FILE})
+# Use our local copy instead of the system one
+INCLUDE(${CMAKE_SOURCE_DIR}/CMake/MantaUseSWIG.cmake)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 

Modified: trunk/SwigInterface/test/CMakeLists.txt
==============================================================================
--- trunk/SwigInterface/test/CMakeLists.txt     (original)
+++ trunk/SwigInterface/test/CMakeLists.txt     Thu Aug 24 14:52:05 2006
@@ -19,7 +19,7 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/MantaUseSWIG.cmake)
+INCLUDE(${CMAKE_CURRENT_SOURCE_DIR/../../CMake/MantaUseSWIG.cmake)
 
 MACRO(MANTA_BUILD_SWIG_MODULE module_name interface_file)
   SET_SOURCE_FILES_PROPERTIES(${interface_file} PROPERTIES CPLUSPLUS ON)

Modified: trunk/commandlines
==============================================================================
--- trunk/commandlines  (original)
+++ trunk/commandlines  Thu Aug 24 14:52:05 2006
@@ -5,3 +5,5 @@
 bin/manta -res 1312x800 -bench 200 10 -imagetraverser null -np 1 
-imagedisplay "opengl(-mode image)"
 bin/manta -res 1312x800 -bench 200 10 -imagetraverser null -np 1 
-imagedisplay "opengl(-mode texture)"
 bin/dm_demo -bookmarks /scratch/bigler/Boeing777/Boeing777.v3c1.txt -np 10 
-scene "lib/libscene_boeing777.so ( -file 
/scratch/bigler/Boeing777/Boeing777.v3c1 -np 10 )"
+commandlines
+bin/manta -res 2000x2000 -ui null -pixelsampler 
"jittersample(-numberOfSamples 9)" -bench 1 0 -imagetype rgba8 -camera 
"pinhole( -eye 220.825 -259.284 304.412 -lookat 266.845 6.34768 208.678 -up 
0.100322 0.213002 0.971888 -fov 46.7236 )" -imagedisplay "file(-type tga 
-prefix boeing)" -np 15 -scene "lib/libscene_boeing777.so( -file 
/scratch/bigler/Boeing777/Boeing777.v3c1 -alpha 0.3 -np 10 )"

---

• [MANTA] r1190 - in trunk: . CMake SwigInterface SwigInterface/test, bigler, 08/24/2006

---

Archive powered by MHonArc 2.6.16.