Changeset 222

Timestamp:

01/05/09 19:54:28 (16 years ago)

Author:

smidl

Message:

Changes in CMake build system

Files:

• CMakeLists.txt (modified) (1 diff)
• doprava/CMakeLists.txt (modified) (1 diff)
• pmsm/CMakeLists.txt (modified) (1 diff)
• tests/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -52 +52 @@
 ENDIF(XERCES_FOUND)
 
+##
+## PREPARE MACROS for building executables
+##
+
+IF(WIN32)
+        SET(AddLib libacml_dll)
+ENDIF(WIN32)
+
+MACRO(EXEC FN)
+        add_executable (${FN} ${FN}.cpp)
+        target_link_libraries (${FN} debug itpp_debug)
+        target_link_libraries (${FN} optimized itpp)
+        target_link_libraries (${FN} bdm ${AddLib})
+        target_link_libraries (${FN} ${ARGN}) ## Additional libraries can be added to a macro
+ENDMACRO(EXEC)
+
+
 # Local ettings should be written to file called CMakeLists.local
 # Use this option for machine-specific options, such as prallel architectures

doprava/CMakeLists.txt

@@ -6 +6 @@
 
 
-## Save all needed libraries in variable BdmLibs
-IF(WIN32)
-        SET(AddLib libacml_dll)
-ENDIF(WIN32)
-
-# Add executable called "helloDemo" that is built from the source files
-# "demo.cxx" and "demo_b.cxx".  The extensions are automatically found.
-add_executable (k1 k1.cpp)
-# Link the executable to the Hello library.
-target_link_libraries (k1 debug itpp_debug)
-target_link_libraries (k1 optimized itpp)
-target_link_libraries (k1 bdm ${AddLib})
+EXEC(k1)

pmsm/CMakeLists.txt

@@ -5 +5 @@
 link_directories (${BDM_BINARY_DIR}/bdm)
 
+# no simulator needed...
+EXEC (pmsm_unkQ )
+EXEC (pmsm_unkQpf)
+EXEC(testbidiff)
+
+
+###STUFF with SIMULATOR
+
+## Build simulator
 add_subdirectory (simulator_zdenek)
 add_subdirectory (simulator_zdenek/ekf_example)
 
-
-## Save all needed libraries in variable BdmLibs
-#SET(BdmLibs bdm itpp_debug)
-SET(BdmLibs bdm itpp)
-
-IF(WIN32)
-        SET(BdmLibs ${BdmLibs} libacml_dll)
-ENDIF(WIN32)
-
-# Add executable called "helloDemo" that is built from the source files
-# "demo.cxx" and "demo_b.cxx".  The extensions are automatically found.
-add_executable (pmsm_unkQ pmsm_unkQ.cpp)
-add_executable (pmsm_unkQpf pmsm_unkQpf.cpp)
-# Link the executable to the Hello library.
-target_link_libraries (pmsm_unkQ ${BdmLibs})
-target_link_libraries (pmsm_unkQpf ${BdmLibs})
-
-# PMSM stuff
-add_executable (testbidiff testbidiff.cpp)
-target_link_libraries (testbidiff ${BdmLibs})
-
+## Use it
 include_directories (./simulator_zdenek)
 link_directories (./simulator_zdenek)
-link_directories (./simulator_zdenek/ekf_example)
-add_executable (pmsm_sim pmsm_sim.cpp)
-add_executable (pmsm_sim2 pmsm_sim2.cpp)
-target_link_libraries (pmsm_sim ${BdmLibs} pmsmsim )
-target_link_libraries (pmsm_sim2 ${BdmLibs} pmsmsim )
+#link_directories (./simulator_zdenek/ekf_example)
 
-add_executable (mpf_test mpf_test.cpp)
-target_link_libraries (mpf_test ${BdmLibs} pmsmsim)
-add_executable (sim sim.cpp)
-target_link_libraries (sim ${BdmLibs} pmsmsim)
-add_executable (sim_var sim_var.cpp)
-target_link_libraries (sim_var ${BdmLibs} pmsmsim)
-add_executable (sim_var_arx sim_var_arx.cpp)
-target_link_libraries (sim_var_arx ${BdmLibs} pmsmsim)
-add_executable (pmsm_mix pmsm_mix.cpp)
-target_link_libraries (pmsm_mix ${BdmLibs} pmsmsim)
+EXEC (pmsm_sim pmsmsim)
+EXEC (pmsm_sim2 pmsmsim)
+EXEC (mpf_test pmsmsim)
+EXEC (sim pmsmsim)
+EXEC (sim_var pmsmsim)
+EXEC (sim_var_arx pmsmsim)
+EXEC (pmsm_mix pmsmsim)
+

tests/CMakeLists.txt

@@ -5 +5 @@
 link_directories (${BDM_BINARY_DIR}/bdm)
 
-## Save all needed libraries in variable BdmLibs
-#SET(BdmLibs bdm itpp_debug)
-#SET(BdmLibs bdm itpp)
-#SET(ITppLibs itpp_debug)
-
-IF(WIN32)
-        SET(AddLib libacml_dll)
-ENDIF(WIN32)
-
-# Define macro for testing a file
-MACRO(TEST FN)
-        add_executable (${FN} ${FN}.cpp)
-        target_link_libraries (${FN} debug itpp_debug)
-        target_link_libraries (${FN} optimized itpp)
-        target_link_libraries (${FN} bdm ${AddLib})
-ENDMACRO(TEST)
-
 # Add executable called "helloDemo" that is built from the source files
 # "demo.cxx" and "demo_b.cxx".  The extensions are automatically found.
 
-# BASIC TESTS
-TEST(rv_test)
-TEST(datalink_test)
-TEST(loggers_test)
+# BASIC EXECS
+EXEC(rv_test)
+EXEC(datalink_test)
+EXEC(loggers_test)
 
-TEST(chmat_test)
-TEST(ldmat_test)
-TEST(fsqmat_test)
-TEST(enorm_test)
-TEST(egiw_test)
-TEST(emix_test)
-TEST(test0)
-TEST(testResample)
+EXEC(chmat_test)
+EXEC(ldmat_test)
+EXEC(fsqmat_test)
+EXEC(enorm_test)
+EXEC(egiw_test)
+EXEC(emix_test)
+EXEC(test0)
+EXEC(testResample)
 
-# ESTIM TESTS
-TEST(arx_test)
-TEST(arx_elem_test)
-TEST(merger_test)
-TEST(merger_2d_test)
-TEST(merger_iter_test)
-TEST(mixef_test)
+# ESTIM EXECS
+EXEC(arx_test)
+EXEC(arx_elem_test)
+EXEC(merger_test)
+EXEC(merger_2d_test)
+EXEC(merger_iter_test)
+EXEC(mixef_test)
 
-TEST(testKF)
-TEST(testPF)
-TEST(testSmp)
-TEST(testEpdf)
-TEST(testKF_QR)
-TEST(testKF_QRexh)
+EXEC(testKF)
+EXEC(testPF)
+EXEC(testSmp)
+EXEC(testEpdf)
+EXEC(testKF_QR)
+EXEC(testKF_QRexh)
 
-add_executable(blas_test blas_test.cpp)
-target_link_libraries (blas_test debug itpp_debug)
-target_link_libraries (blas_test optimized itpp)
-target_link_libraries (blas_test ${AddLib})
+EXEC(blas_test)
 
-SET(AddLib ${AddLib} ${XERCES_LIBRARIES})
-TEST(testUI)
+EXEC(testUI)
+target_link_libraries (testUI ${XERCES_LIBRARIES})