[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54686] trunk/blender: Made ldl code a part of extern_ssba library, otherwise gcc fails to

[Sergey Sharybin]

Revision: 54686
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54686
Author:   nazgul
Date:     2013-02-20 12:07:27 +0000 (Wed, 20 Feb 2013)
Log Message:
-----------
Made ldl code a part of extern_ssba library, otherwise gcc fails to
find ldl symbols because order of libraries seems to be critical
for gcc linker.

A bit stupid, but that's how linker works..

Both CMake and SCons shall work fine on linux now.

Modified Paths:
--------------
    trunk/blender/extern/libmv/CMakeLists.txt
    trunk/blender/extern/libmv/SConscript
    trunk/blender/extern/libmv/third_party/ssba/CMakeLists.txt
    trunk/blender/extern/libmv/third_party/ssba/SConscript
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt	2013-02-20 11:41:33 UTC (rev 54685)
+++ trunk/blender/extern/libmv/CMakeLists.txt	2013-02-20 12:07:27 UTC (rev 54686)
@@ -35,7 +35,6 @@
 set(INC_SYS
 	../Eigen3
 	third_party/ssba
-	third_party/ldl/Include
 	${PNG_INCLUDE_DIR}
 	${ZLIB_INCLUDE_DIRS}
 )
@@ -83,7 +82,6 @@
 	third_party/gflags/gflags.cc
 	third_party/gflags/gflags_completions.cc
 	third_party/gflags/gflags_reporting.cc
-	third_party/ldl/Source/ldl.c
 
 	libmv-capi.h
 	libmv/base/id_generator.h
@@ -141,7 +139,6 @@
 	third_party/gflags/gflags/gflags.h
 	third_party/gflags/mutex.h
 	third_party/gflags/util.h
-	third_party/ldl/Include/ldl.h
 	third_party/msinttypes/inttypes.h
 	third_party/msinttypes/stdint.h
 )

Modified: trunk/blender/extern/libmv/SConscript
===================================================================
--- trunk/blender/extern/libmv/SConscript	2013-02-20 11:41:33 UTC (rev 54685)
+++ trunk/blender/extern/libmv/SConscript	2013-02-20 12:07:27 UTC (rev 54686)
@@ -22,7 +22,6 @@
 src += env.Glob('libmv/tracking/*.cc')
 src += env.Glob('third_party/fast/*.c')
 src += env.Glob('third_party/gflags/*.cc')
-src += env.Glob('third_party/ldl/Source/*.c')
 
 incs = '. ../Eigen3 third_party/ceres/include'
 incs += ' ' + env['BF_PNG_INC']
@@ -39,7 +38,7 @@
     src += env.Glob("third_party/glog/src/*.cc")
     incs += ' ./third_party/glog/src'
 
-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
+incs += ' ./third_party/ssba ../colamd/Include'
 
 env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137] )
 

Modified: trunk/blender/extern/libmv/third_party/ssba/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/third_party/ssba/CMakeLists.txt	2013-02-20 11:41:33 UTC (rev 54685)
+++ trunk/blender/extern/libmv/third_party/ssba/CMakeLists.txt	2013-02-20 12:07:27 UTC (rev 54686)
@@ -42,6 +42,9 @@
 	Math/v3d_linear_utils.h
 	Math/v3d_mathutilities.h
 	Math/v3d_optimization.h
+
+	../ldl/Source/ldl.c
+	../ldl/Include/ldl.h
 )
 
 if(WIN32)

Modified: trunk/blender/extern/libmv/third_party/ssba/SConscript
===================================================================
--- trunk/blender/extern/libmv/third_party/ssba/SConscript	2013-02-20 11:41:33 UTC (rev 54685)
+++ trunk/blender/extern/libmv/third_party/ssba/SConscript	2013-02-20 12:07:27 UTC (rev 54686)
@@ -15,6 +15,7 @@
 
 src = env.Glob('Geometry/*.cpp')
 src += env.Glob('Math/*.cpp')
+src += env.Glob('../ldl/Source/*.c')
 
 incs = '. ../ldl/Include ../../../colamd/Include'
 

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2013-02-20 11:41:33 UTC (rev 54685)
+++ trunk/blender/source/creator/CMakeLists.txt	2013-02-20 12:07:27 UTC (rev 54686)
@@ -923,8 +923,8 @@
 
 	if(WITH_LIBMV)
 		list(APPEND BLENDER_SORTED_LIBS extern_libmv)
+		list(APPEND BLENDER_SORTED_LIBS extern_ssba)
 		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
-		list(APPEND BLENDER_SORTED_LIBS extern_ssba)
 	endif()
 
 	if(WITH_MOD_CLOTH_ELTOPO)