Changeset 292

Timestamp:

03/09/09 15:19:32 (16 years ago)

Author:

mido

Message:

rozbehan build pod VS 9.0, a implicitni parametr CMake pod Windows nastaven na tuto verzi

Files:

• CMake_modules/FindITPP.cmake (modified) (1 diff)
• bdm/stat/libFN.cpp (modified) (1 diff)
• bdm/stat/libFN.h (modified) (1 diff)
• win32/run_cmake.bat (modified) (1 diff)

CMake_modules/FindITPP.cmake

@@ -11 +11 @@
 
 FIND_PATH(ITPP_INCLUDE_DIR itpp/itbase.h
-        ${ITPP_DIR}/include
+        ${ITPP_DIR}
         /usr/pkgs64/include
         /usr/include

bdm/stat/libFN.cpp

@@ -4 +4 @@
 using std::endl;
 using namespace bdm;
-
-
-inline vec bilinfn::eval ( const  vec &x0, const vec &u0 )
-{
-        it_assert_debug ( x0.length() ==dimx, "linfn::eval Wrong xcond." );
-        it_assert_debug ( u0.length() ==dimu, "linfn::eval Wrong ucond." );
-        return A*x0+B*u0;
-};

bdm/stat/libFN.h

@@ -117 +117 @@
                 //!\name Mathematical operations
                 //!@{
-                vec eval ( const  vec &x0, const vec &u0 );
+                inline vec eval ( const  vec &x0, const vec &u0 )
+                {
+                        it_assert_debug ( x0.length() ==dimx, "linfn::eval Wrong xcond." );
+                        it_assert_debug ( u0.length() ==dimu, "linfn::eval Wrong ucond." );
+                        return A*x0+B*u0;
+                }
+
                 void dfdx_cond ( const vec &x0, const vec &u0, mat &F, bool full )
                 {

win32/run_cmake.bat

@@ -1 +1 @@
 @echo off
 cd ..
-"c:\Devel\CMake 2.6\bin\cmake.exe" -G "Visual Studio 8 2005"
+cmake -G "Visual Studio 9 2008"
 pause