rpms/mingw32-OpenSceneGraph/devel TryRunResults.cmake, NONE, 1.1 .cvsignore, 1.2, 1.3 mingw32-OpenSceneGraph.spec, 1.1, 1.2 sources, 1.2, 1.3

[stefanriemens]

Author: stefanriemens

Update of /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27138

Modified Files:
	.cvsignore mingw32-OpenSceneGraph.spec sources 
Added Files:
	TryRunResults.cmake 
Log Message:
Fix FTBFS by telling cmake the test results of running a binary.
It can't do this itself as it is x-compiling



--- NEW FILE TryRunResults.cmake ---
# This file was generated by CMake because it detected TRY_RUN() commands
# in crosscompiling mode. It will be overwritten by the next CMake run.
# Copy it to a safe location, set the variables to appropriate values
# and use it then to preset the CMake cache (using -C).


# _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE
#    indicates whether the executable would have been able to run on its
#    target platform. If so, set _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE to
#    the exit code (in many cases 0 for success), otherwise enter "FAILED_TO_RUN".
# The _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_COMPILED variable holds the build result for this TRY_RUN().
# 
# Source file   : /home/stefan/OpenSceneGraph-2.8.2/build/CMakeFiles/CMakeTmp/src.cxx
# Executable    : /home/stefan/OpenSceneGraph-2.8.2/build/CMakeFiles/cmTryCompileExec-_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE.exe
# Run arguments : 
#    Called from: [2]	/home/stefan/OpenSceneGraph-2.8.2/CMakeModules/CheckAtomicOps.cmake
#                 [1]	/home/stefan/OpenSceneGraph-2.8.2/src/OpenThreads/CMakeLists.txt

SET( _OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE 
     0
     CACHE INT 0 FORCE)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Jan 2010 18:30:56 -0000	1.2
+++ .cvsignore	3 Jul 2010 14:14:49 -0000	1.3
@@ -1 +1 @@
-OpenSceneGraph-2.8.2.zip
+OpenSceneGraph-2.8.3.zip


Index: mingw32-OpenSceneGraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel/mingw32-OpenSceneGraph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mingw32-OpenSceneGraph.spec	3 Jan 2010 18:30:56 -0000	1.1
+++ mingw32-OpenSceneGraph.spec	3 Jul 2010 14:14:49 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:           mingw32-OpenSceneGraph
 Version:        %{apivers}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fedora mingw high performance real-time graphics toolkit
 
 Group:          Development/Libraries
@@ -18,6 +18,9 @@ License:        wxWidgets
 URL:            http://www.openscenegraph.org/
 Source0:        http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-%{version}/source/OpenSceneGraph-%{version}.zip
 
+# we are cross-compiling, so we need to tell cmake the results of running it's binaries...
+Source1:        TryRunResults.cmake
+
 #native versions patches:
 Patch0:         OpenSceneGraph-%{version}.diff
 
@@ -71,7 +74,12 @@ cd ..
 mkdir -p BUILD
 pushd BUILD
 
-%_mingw32_cmake -DBUILD_OSG_EXAMPLES=OFF -DBUILD_OSG_WRAPPERS=OFF -DBUILD_DOCUMENTATION=OFF ../%{OSGSRCDIR}
+%_mingw32_cmake \
+  -DBUILD_OSG_EXAMPLES=OFF \
+  -DBUILD_OSG_WRAPPERS=OFF \
+  -DBUILD_DOCUMENTATION=OFF \
+  -C %{SOURCE1} \
+  ../%{OSGSRCDIR}
 make %{?_smp_mflags}
 
 popd
@@ -220,6 +228,9 @@ compile-time in a shared object library.
 %{_mingw32_includedir}/OpenThreads
 
 %changelog
+* Sat Jul 3 2010 Stefan Riemens <fgfs.stefan at gmail.com> - 2.8.2-3
+- Fix FTBFS by telling cmake it's test results.
+
 * Thu Dec 17 2009 Stefan Riemens <fgfs.stefan at gmail.com> - 2.8.2-2
 - Fix unowned directory
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-OpenSceneGraph/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Jan 2010 18:30:56 -0000	1.2
+++ sources	3 Jul 2010 14:14:49 -0000	1.3
@@ -1 +1 @@
-99d0b37f403b85b4559514b6b9849d9e  OpenSceneGraph-2.8.2.zip
+dc43b9161555c4eab7f5a678dd4e01ab  OpenSceneGraph-2.8.3.zip