Merge pull request #2 from mquinson/master

[simgrid.git] / examples / msg / tracing / CMakeLists.txt

diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt
index 4cee270..8cdba72 100644 (file)
--- a/examples/msg/tracing/CMakeLists.txt
+++ b/examples/msg/tracing/CMakeLists.txt
@@ -1,35 +1,30 @@
-cmake_minimum_required(VERSION 2.6)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+set(LIBRARY_OUTPUT_PATH "${CMAKE_HOME_DIRECTORY}/lib")
 
-if(HAVE_TRACING)
-  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-  set(LIBRARY_OUTPUT_PATH "${CMAKE_HOME_DIRECTORY}/lib")
+add_executable(ms                         ${CMAKE_CURRENT_SOURCE_DIR}/ms.c)
+add_executable(categories                 ${CMAKE_CURRENT_SOURCE_DIR}/categories.c)
+add_executable(procmig                    ${CMAKE_CURRENT_SOURCE_DIR}/procmig.c)
+add_executable(simple                     ${CMAKE_CURRENT_SOURCE_DIR}/simple.c)
+add_executable(trace_platform             ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.c)
+add_executable(user_variables             ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.c)
+add_executable(link_user_variables        ${CMAKE_CURRENT_SOURCE_DIR}/link_user_variables.c)
+add_executable(link_srcdst_user_variables ${CMAKE_CURRENT_SOURCE_DIR}/link_srcdst_user_variables.c)
 
-  add_executable(ms         ${CMAKE_CURRENT_SOURCE_DIR}/ms.c)
-  add_executable(categories ${CMAKE_CURRENT_SOURCE_DIR}/categories.c)
-  add_executable(procmig    ${CMAKE_CURRENT_SOURCE_DIR}/procmig.c)
-  add_executable(simple     ${CMAKE_CURRENT_SOURCE_DIR}/simple.c)
-  add_executable(trace_platform     ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.c)
-  add_executable(user_variables     ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.c)
-  add_executable(link_user_variables     ${CMAKE_CURRENT_SOURCE_DIR}/link_user_variables.c)
-  add_executable(link_srcdst_user_variables     ${CMAKE_CURRENT_SOURCE_DIR}/link_srcdst_user_variables.c)
+target_link_libraries(ms simgrid )
+target_link_libraries(categories simgrid )
+target_link_libraries(procmig simgrid )
+target_link_libraries(simple simgrid )
+target_link_libraries(trace_platform simgrid )
+target_link_libraries(user_variables simgrid )
+target_link_libraries(link_user_variables simgrid )
+target_link_libraries(link_srcdst_user_variables simgrid )
 
-  ### Add definitions for compile
-  target_link_libraries(ms simgrid )
-  target_link_libraries(categories simgrid )
-  target_link_libraries(procmig simgrid )
-  target_link_libraries(simple simgrid )
-  target_link_libraries(trace_platform simgrid )
-  target_link_libraries(user_variables simgrid )
-  target_link_libraries(link_user_variables simgrid )
-  target_link_libraries(link_srcdst_user_variables simgrid )
-
-  ## Clean generated files
-  get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
-  set_directory_properties(
-    PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
-    "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;"
-    )
-endif()
+## Clean generated files
+get_directory_property(extra_clean_files ADDITIONAL_MAKE_CLEAN_FILES)
+set_directory_properties(
+  PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+  "${extra_clean_files};${CMAKE_CURRENT_BINARY_DIR}/ms.cat.plist;${CMAKE_CURRENT_BINARY_DIR}/ms.trace;${CMAKE_CURRENT_BINARY_DIR}/ms.uncat.plist;"
+  )
 
 set(tesh_files
   ${tesh_files}
@@ -40,14 +35,12 @@ set(tesh_files
   ${CMAKE_CURRENT_SOURCE_DIR}/procmig.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.tesh
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/procmig-deploy.xml
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/categories.c
@@ -58,13 +51,4 @@ set(examples_src
   ${CMAKE_CURRENT_SOURCE_DIR}/simple.c
   ${CMAKE_CURRENT_SOURCE_DIR}/trace_platform.c
   ${CMAKE_CURRENT_SOURCE_DIR}/user_variables.c
-  PARENT_SCOPE
-  )
-set(bin_files
-  ${bin_files}
-  PARENT_SCOPE
-  )
-set(txt_files
-  ${txt_files}
-  PARENT_SCOPE
-  )
+  PARENT_SCOPE)