Changeset 73

Show
Ignore:
Timestamp:
04/10/08 15:45:23 (17 years ago)
Author:
smidl
Message:

presun pmsm dokoncen

Files:
3 modified
1 moved

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r68 r73  
    5151add_subdirectory (bdm) 
    5252add_subdirectory (tests) 
    53 add_subdirectory (simulator_zdenek) 
    54 add_subdirectory (simulator_zdenek/ekf_example) 
     53add_subdirectory (pmsm) 

  • pmsm/CMakeLists.txt

    r72 r73  
    44# Make sure the linker can find the Hello library once it is built. 
    55link_directories (${BDM_BINARY_DIR}/bdm) 
     6 
     7add_subdirectory (simulator_zdenek) 
     8add_subdirectory (simulator_zdenek/ekf_example) 
     9 
    610 
    711## Save all needed libraries in variable BdmLibs 
    … …  
    1519# Add executable called "helloDemo" that is built from the source files 
    1620# "demo.cxx" and "demo_b.cxx".  The extensions are automatically found. 
    17 add_executable (test0 test0.cpp) 
    18 add_executable (testKF testKF.cpp) 
    19 add_executable (testPF testPF.cpp) 
    20 add_executable (testSmp testSmp.cpp) 
    21 add_executable (testEpdf testEpdf.cpp) 
    22 add_executable (testResample testResample.cpp) 
    23 add_executable (testKF_QR testKF_QR.cpp) 
    24 add_executable (testKF_QRexh testKF_QRexh.cpp) 
    2521add_executable (pmsm_unkQ pmsm_unkQ.cpp) 
    2622add_executable (pmsm_unkQpf pmsm_unkQpf.cpp) 
    27  
    28  
    2923# Link the executable to the Hello library. 
    30 target_link_libraries (test0 ${BdmLibs}) 
    31 target_link_libraries (testKF ${BdmLibs}) 
    32 target_link_libraries (testPF ${BdmLibs}) 
    33 target_link_libraries (testSmp ${BdmLibs}) 
    34 target_link_libraries (testEpdf ${BdmLibs}) 
    35 target_link_libraries (testResample ${BdmLibs}) 
    36 target_link_libraries (testKF_QR ${BdmLibs}) 
    37 target_link_libraries (testKF_QRexh ${BdmLibs}) 
    3824target_link_libraries (pmsm_unkQ ${BdmLibs}) 
    3925target_link_libraries (pmsm_unkQpf ${BdmLibs}) 
    … …  
    4329target_link_libraries (testbidiff ${BdmLibs}) 
    4430 
    45 include_directories (${BDM_SOURCE_DIR}/simulator_zdenek) 
    46 link_directories (${BDM_BINARY_DIR}/simulator_zdenek) 
    47 link_directories (${BDM_BINARY_DIR}/simulator_zdenek/ekf_example) 
     31include_directories (./simulator_zdenek) 
     32link_directories (./simulator_zdenek) 
     33link_directories (./simulator_zdenek/ekf_example) 
    4834add_executable (pmsm_sim pmsm_sim.cpp) 
    4935add_executable (pmsm_sim2 pmsm_sim2.cpp) 

  • tests/CMakeLists.txt

    r64 r73  
    2323add_executable (testKF_QR testKF_QR.cpp) 
    2424add_executable (testKF_QRexh testKF_QRexh.cpp) 
    25 add_executable (pmsm_unkQ pmsm_unkQ.cpp) 
    26 add_executable (pmsm_unkQpf pmsm_unkQpf.cpp) 
    2725 
    2826 
    … …  
    3634target_link_libraries (testKF_QR ${BdmLibs}) 
    3735target_link_libraries (testKF_QRexh ${BdmLibs}) 
    38 target_link_libraries (pmsm_unkQ ${BdmLibs}) 
    39 target_link_libraries (pmsm_unkQpf ${BdmLibs}) 
    4036 
    41 # PMSM stuff 
    42 add_executable (testbidiff testbidiff.cpp) 
    43 target_link_libraries (testbidiff ${BdmLibs}) 
    44  
    45 include_directories (${BDM_SOURCE_DIR}/simulator_zdenek) 
    46 link_directories (${BDM_BINARY_DIR}/simulator_zdenek) 
    47 link_directories (${BDM_BINARY_DIR}/simulator_zdenek/ekf_example) 
    48 add_executable (pmsm_sim pmsm_sim.cpp) 
    49 add_executable (pmsm_sim2 pmsm_sim2.cpp) 
    50 add_executable (pmsm_sim3 pmsm_sim3.cpp) 
    51 target_link_libraries (pmsm_sim ${BdmLibs} pmsmsim ) 
    52 target_link_libraries (pmsm_sim2 ${BdmLibs} pmsmsim ) 
    53 target_link_libraries (pmsm_sim3 ${BdmLibs} pmsmsim ekf_obj)