teem (1.11.0~svn5226-1) 10_all_changes.diff

Summary

 CMakeLists.txt         |   10 ++++++----
 Testing/CMakeLists.txt |    2 +-
 src/bin/CMakeLists.txt |   44 ++++++++++++++++++++++----------------------
 3 files changed, 29 insertions(+), 27 deletions(-)

    
download this patch

Patch contents

Index: teem-1.11.0~svn5226/CMakeLists.txt
===================================================================
--- teem-1.11.0~svn5226.orig/CMakeLists.txt	2012-04-07 00:05:22.980493042 -0400
+++ teem-1.11.0~svn5226/CMakeLists.txt	2012-04-07 00:06:40.508877479 -0400
@@ -222,11 +222,13 @@
 # On Apple this should be done at compile time since it is 
 # possible to compile several architectures simultaneously
 if( NOT APPLE )
-  IF(CMAKE_WORDS_BIGENDIAN)
+  INCLUDE(TestBigEndian)
+  TEST_BIG_ENDIAN(BIGENDIAN)
+  IF(${BIGENDIAN})
     ADD_DEFINITIONS(-DTEEM_ENDIAN=4321)
-  ELSE(CMAKE_WORDS_BIGENDIAN)
+  ELSE()
     ADD_DEFINITIONS(-DTEEM_ENDIAN=1234)
-  ENDIF(CMAKE_WORDS_BIGENDIAN)
+  ENDIF()
 endif( NOT APPLE )
 
 #The QNANHIBIT variable is configured by the root level CMakeLists.txt
@@ -369,7 +371,7 @@
   BUILD_WITH_INSTALL_RPATH OFF
   INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
   INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib
-  SOVERSION 1
+  SOVERSION 2
   VERSION ${Teem_VERSION_STRING}
   )
 
Index: teem-1.11.0~svn5226/src/bin/CMakeLists.txt
===================================================================
--- teem-1.11.0~svn5226.orig/src/bin/CMakeLists.txt	2012-04-07 00:05:22.980493042 -0400
+++ teem-1.11.0~svn5226/src/bin/CMakeLists.txt	2012-04-07 00:05:23.000000000 -0400
@@ -32,34 +32,34 @@
 ENDMACRO(CREATE_EXEC)
 
 # These binaries should not be depending on BUILD_EXPERIMENTAL_LIBS
-CREATE_EXEC(nrrdSanity nrrdSanity.c)
-CREATE_EXEC(overrgb overrgb.c)
-CREATE_EXEC(ilk ilk.c)
-CREATE_EXEC(mrender mrender.c)
-CREATE_EXEC(miter miter.c)
-CREATE_EXEC(vprobe vprobe.c)
-CREATE_EXEC(gprobe gprobe.c)
-CREATE_EXEC(unu unu.c)
-CREATE_EXEC(puller puller.c)
-CREATE_EXEC(tend tend.c)
+CREATE_EXEC(teem-nrrdSanity nrrdSanity.c)
+CREATE_EXEC(teem-overrgb overrgb.c)
+CREATE_EXEC(teem-ilk ilk.c)
+CREATE_EXEC(teem-mrender mrender.c)
+CREATE_EXEC(teem-miter miter.c)
+CREATE_EXEC(teem-vprobe vprobe.c)
+CREATE_EXEC(teem-gprobe gprobe.c)
+CREATE_EXEC(teem-unu unu.c)
+CREATE_EXEC(teem-puller puller.c)
+CREATE_EXEC(teem-tend tend.c)
 
 # NOTE: The BUILD_EXPERIMENTAL_LIBS-dependent inclusion of binaries has to be
 # done with knowledge of how BUILD_EXPERIMENTAL_LIBS behaves in the top-level
 # CMakeLists.txt file
 IF(BUILD_EXPERIMENTAL_APPS)
-  CREATE_EXEC(airSanity airSanity.c)
-  CREATE_EXEC(cubic cubic.c)
-  CREATE_EXEC(undos undos.c)
-  CREATE_EXEC(qbert qbert.c)
-  CREATE_EXEC(emap emap.c)
-  CREATE_EXEC(talkweb talkweb.c)
-  CREATE_EXEC(pprobe pprobe.c)
-  CREATE_EXEC(ninspect ninspect.c)
-  CREATE_EXEC(ungantry ungantry.c)
-  CREATE_EXEC(deconv deconv.c)
+  CREATE_EXEC(teem-airSanity airSanity.c)
+  CREATE_EXEC(teem-cubic cubic.c)
+  CREATE_EXEC(teem-undos undos.c)
+  CREATE_EXEC(teem-qbert qbert.c)
+  CREATE_EXEC(teem-emap emap.c)
+  CREATE_EXEC(teem-talkweb talkweb.c)
+  CREATE_EXEC(teem-pprobe pprobe.c)
+  CREATE_EXEC(teem-ninspect ninspect.c)
+  CREATE_EXEC(teem-ungantry ungantry.c)
+  CREATE_EXEC(teem-deconv deconv.c)
   IF(BUILD_EXPERIMENTAL_LIBS)
-    CREATE_EXEC(gkms gkms.c)
-    CREATE_EXEC(spots spots.c)
+    CREATE_EXEC(teem-gkms gkms.c)
+    CREATE_EXEC(teem-spots spots.c)
   ENDIF(BUILD_EXPERIMENTAL_LIBS)
 ENDIF(BUILD_EXPERIMENTAL_APPS)
 
Index: teem-1.11.0~svn5226/Testing/CMakeLists.txt
===================================================================
--- teem-1.11.0~svn5226.orig/Testing/CMakeLists.txt	2012-04-07 00:05:22.980493042 -0400
+++ teem-1.11.0~svn5226/Testing/CMakeLists.txt	2012-04-07 00:05:23.000000000 -0400
@@ -43,7 +43,7 @@
   "${CMAKE_BINARY_DIR}/include/testDataPath.h"
   )
 
-ADD_TEST(nrrd.Sanity ${EXECUTABLE_OUTPUT_PATH}/nrrdSanity)
+ADD_TEST(nrrd.Sanity ${EXECUTABLE_OUTPUT_PATH}/teem-nrrdSanity)
 
 ADD_SUBDIRECTORY(air)
 ADD_SUBDIRECTORY(biff)