Changeset 319

Timestamp:

04/23/09 14:05:32 (16 years ago)

Author:

mido

Message:

velke preskupeni adresare, zalozeny a naplneny adresare \applications a \system, u mne vse chodi tak jak ma, co na linuxu?

Files:

• CMakeLists.txt (modified) (2 diffs)
• applications (added)
• applications/CMakeLists.txt (added)
• applications/doprava (moved) (moved from doprava)
• applications/mpdm (moved) (moved from mpdm)
• applications/pmsm (moved) (moved from pmsm)
• doc/html/install.html (modified) (1 diff)
• library/mex/buildmex.bat (modified) (1 diff)
• library/mex/buildmex.sh (modified) (1 diff)
• system (added)
• system/linux (moved) (moved from linux)
• system/win32 (moved) (moved from win32)
• system/win32/run_cmake.bat (modified) (1 diff)

CMakeLists.txt

@@ -16 +16 @@
 IF(WIN32)
 # IF YOU WANT TO USE YOUR OWN INSTALLATION OF THE NEXT EXTERNAL LIBRARIES,
-# THEN IT IS NECESSARY TO CREATE TEXT FILE "\WIN32\LOCAL_PATHS.TXT" WITH 
+# THEN IT IS NECESSARY TO CREATE TEXT FILE "\system\WIN32\LOCAL_PATHS.TXT" WITH 
 # COPIES OF THE TWO FOLLOWING LINES AND THEN CORECT ALL THE INVOLVED PATHS
-        SET(ITPP_DIR "${BDM_SOURCE_DIR}\\win32\\itpp-4.0.6")
-        SET(ACML_DIR "${BDM_SOURCE_DIR}\\win32\\acml3.6.0")
-        SET(XERCES_DIR "${BDM_SOURCE_DIR}\\win32\\xerces-c_2_8_0-x86")
+        SET(ITPP_DIR "${BDM_SOURCE_DIR}\\system\\\\win32\\itpp-4.0.6")
+        SET(ACML_DIR "${BDM_SOURCE_DIR}\\system\\win32\\acml3.6.0")
+        SET(XERCES_DIR "${BDM_SOURCE_DIR}\\system\\win32\\xerces-c_2_8_0-x86")
 
-        INCLUDE(\\win32\\local_paths.txt OPTIONAL)      
+        INCLUDE(\\system\\win32\\local_paths.txt OPTIONAL)      
         ADD_DEFINITIONS(-DHAVE_ACML)
 ENDIF(WIN32)
@@ -85 +85 @@
 add_subdirectory (bdm)
 add_subdirectory (tests)
-add_subdirectory (pmsm)
-add_subdirectory (mpdm)
+add_subdirectory (applications)
 add_subdirectory (library)
-add_subdirectory (doprava)

doc/html/install.html

@@ -87 +87 @@
 Make sure you have cmake installed.<p>
 Expert users are advised to download and compile their ITPP version following a guide on : <a href="http://itpp.sourceforge.net/current/installation.html">http://itpp.sourceforge.net/current/installation.html</a><p>
-For convenience of the beginners, DLLS of the ACML and lib+include files for ITPP and ACML are provided at: <a href="http://staff.utia.cas.cz/smidl/Public/mixpp_win32lib.zip">http://staff.utia.cas.cz/smidl/Public/mixpp_win32lib.zip</a> If you want to use them copy the content of the zip file to win32\ directory and make sure to set your PATH environment variable: <div class="fragment"><pre class="fragment"> Path = %PATH%; &lt;bdm_dir&gt;\win32\dll
+For convenience of the beginners, DLLS of the ACML and lib+include files for ITPP and ACML are provided at: <a href="http://staff.utia.cas.cz/smidl/Public/mixpp_win32lib.zip">http://staff.utia.cas.cz/smidl/Public/mixpp_win32lib.zip</a> If you want to use them copy the content of the zip file to win32\ directory and make sure to set your PATH environment variable: <div class="fragment"><pre class="fragment"> Path = %PATH%; &lt;bdm_dir&gt;\system\win32\dll
 </pre></div> Otherwise you will not be able to run any programs.<p>
 Compilation of BDM:<p>
-When everything is set-up, make a copy of win32/run_cmake.bat, edit it to reflect your environment (i.e. change paths to cmake and your C++ target environment) and run it.<p>
+When everything is set-up, make a copy of system/win32/run_cmake.bat, edit it to reflect your environment (i.e. change paths to cmake and your C++ target environment) and run it.<p>
 It should generate build files for your compiler in the main BDM directory<h2><a class="anchor" name="mac">
 Mac OS X</a></h2>

library/mex/buildmex.bat

@@ -1 +1 @@
 @set PATH=C:\Program Files\MATLAB71\bin\win32;D:\Visual Studio 9.0\VC\bin;D:\Visual Studio 9.0\Common7\IDE;%PATH%
 
-call mex  -I./  -ID:\utia\mixpp\win32\itpp-4.0.6\ -ID:\utia\mixpp\bdm -f mexopts-opt.bat estimator.cpp D:\utia\mixpp\bdm\Release\bdm.lib D:\utia\mixpp\win32\itpp-4.0.6\win32\lib\itpp.lib "C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib\kernel32.lib" D:\utia\mixpp\win32\acml3.6.0\pgi32\lib\libacml_dll.lib
+call mex  -I./  -ID:\utia\mixpp\system\win32\itpp-4.0.6\ -ID:\utia\mixpp\bdm -f mexopts-opt.bat estimator.cpp D:\utia\mixpp\bdm\Release\bdm.lib D:\utia\mixpp\system\win32\itpp-4.0.6\win32\lib\itpp.lib "C:\Program Files\Microsoft SDKs\Windows\v6.1\Lib\kernel32.lib" D:\utia\mixpp\system\win32\acml3.6.0\pgi32\lib\libacml_dll.lib
 

library/mex/buildmex.sh

@@ -1 +1 @@
 #!/bin/sh
-mex -l itpp -l bdm -I/home/smidl/soft/matlab/matlab/extern/include -I/home/smidl/work/git/mixpp/bdm  -L ../../bdm/ -L ../../linux/libs/ $1 
+mex -l itpp -l bdm -I/home/smidl/soft/matlab/matlab/extern/include -I/home/smidl/work/git/mixpp/bdm  -L ../../bdm/ -L ../../system/linux/libs/ $1 
 #mxestimator.cpp
 #mex -l bdm -I ../../bdm/ -I /home/smidl/soft/matlab/matlab/extern/include -L ../../bdm/ linefit2.cpp

system/win32/run_cmake.bat

@@ -1 +1 @@
 @echo off
-cd ..
+cd ..\..
 cmake -G "Visual Studio 9 2008"
 pause