details:
- cleaning some code (instr/config.h) that was autotools-related
- created a Cmake rule to create a tracing_config.h that contains
the preprocessor variable HAVE_TRACING
- msg/datatypes.h and instr/instr.h needs to include tracing_config.h
to not segfault because of the size of the task struct
- .gitignore updated
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7423
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
testgraph.dot
testgraph.xml
buildtools/Cmake/src/tmp_gras_config.h.in
+buildtools/Cmake/src/tmp_tracing_config.h.in
conftestval
cmake_install.cmake
CMakeFiles
autom4te.cache/*
doc/Doxyfile
include/simgrid_config.h
+include/instr/tracing_config.h
examples/amok/bandwidth/bandwidth_maestro
examples/amok/bandwidth/bandwidth_sensor
examples/amok/saturate/saturate_maestro
configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" @ONLY IMMEDIATE)
configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_gras_config.h.in" "${PROJECT_DIRECTORY}/src/gras_config.h" @ONLY IMMEDIATE)
configure_file(${PROJECT_DIRECTORY}/include/simgrid_config.h.in ${PROJECT_DIRECTORY}/include/simgrid_config.h)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_tracing_config.h.in" @ONLY IMMEDIATE)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tmp_tracing_config.h.in" "${PROJECT_DIRECTORY}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
if(NOT prefix)
set(prefix /usr/local)
--- /dev/null
+/*
+ * tracing_config.h
+ *
+ * Created on: Apri 1, 2010
+ * Author: Lucas Schnorr
+ * License: This program is free software; you can redistribute
+ * it and/or modify it under the terms of the license
+ * (GNU LGPL) which comes with this package.
+ *
+ * Copyright (c) 2009 The SimGrid team.
+ */
+
+#ifndef __TRACING_CONFIG_H
+#define __TRACING_CONFIG_H
+
+/* Tracing SimGrid */
+#cmakedefine HAVE_TRACING @HAVE_TRACING@
+
+#endif
+++ /dev/null
-/* include/instr/config.h. Generated from config.h.in by configure. */
-/* defines whether instrumentation must be compiled or not */
-#define HAVE_TRACING 1
+++ /dev/null
-/* defines whether instrumentation must be compiled or not */
-#undef HAVE_TRACING
#ifndef INSTR_H_
#define INSTR_H_
-#include "instr/config.h"
+#include "instr/tracing_config.h"
#ifdef HAVE_TRACING
#ifndef MSG_DATATYPE_H
#define MSG_DATATYPE_H
#include "xbt/misc.h"
-#include "instr/config.h"
+#include "instr/tracing_config.h" // for HAVE_TRACING
SG_BEGIN_DECL()
*/
#include "instr/private.h"
-#include "instr/config.h"
#ifdef HAVE_TRACING
*/
#include "instr/private.h"
-#include "instr/config.h"
#ifdef HAVE_TRACING
*/
#include "instr/private.h"
-#include "instr/config.h"
#ifdef HAVE_TRACING
*/
#include "instr/private.h"
-#include "instr/config.h"
#ifdef HAVE_TRACING
*/
#include "instr/private.h"
-#include "instr/config.h"
#ifdef HAVE_TRACING
#ifndef INSTR_PRIVATE_H_
#define INSTR_PRIVATE_H_
-#include "instr/config.h"
+#include "instr/tracing_config.h"
#ifdef HAVE_TRACING
*/
#include "instr/private.h"
-#include "instr/config.h"
#ifdef HAVE_TRACING
*/
#include "instr/private.h"
-#include "instr/config.h"
#ifdef HAVE_TRACING
*/
#include "instr/private.h"
-#include "instr/config.h"
#include "surf/surf_private.h"
#include "surf/network_private.h"
#include "xbt/function_types.h"
#include "xbt/ex_interface.h"
#include "instr/private.h"
-#include "instr/config.h"
/******************************** Datatypes ***********************************/