From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 12 Feb 2016 12:11:44 +0000 (+0100)
Subject: [cmake] Fix libsigc++ mode
X-Git-Tag: v3_13~858
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ac4acabfca44f56b0bf0a29c22e9731a53afe2ea?hp=0ef25bc8b50d2820e612d6f416bf2c8657b0658e

[cmake] Fix libsigc++ mode

It was always disabled.
---

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 74f907e561..995dd7f177 100644
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -70,10 +70,9 @@ if(HAVE_GRAPHVIZ)
   endif()
 endif()
 
-if(HAVE_LIBSIGC++)
+if(SIMGRID_HAVE_LIBSIG)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lsigc-2.0")
   add_definitions(-DLIBSIGC)
-  set(SIMGRID_HAVE_LIBSIG 1)
 endif()
 
 if(HAVE_MC)
diff --git a/tools/cmake/Modules/FindLibSigc++.cmake b/tools/cmake/Modules/FindLibSigc++.cmake
index 2d2aa030af..e052359863 100644
--- a/tools/cmake/Modules/FindLibSigc++.cmake
+++ b/tools/cmake/Modules/FindLibSigc++.cmake
@@ -61,9 +61,9 @@ if(PATH_LIBSIGC++_LIB AND PATH_LIBSIGC++_H AND PATH_LIBSIGC++CONFIG_H)
   include_directories(${PATH_LIBSIGC++_H})
   include_directories(${PATH_LIBSIGC++CONFIG_H})
   link_directories(${PATH_LIBSIGC++_LIB})
-  set(HAVE_LIBSIGC++ "1")
+  set(SIMGRID_HAVE_LIBSIG "1")
 else()
-  set(HAVE_LIBSIGC++ "0")
+  set(SIMGRID_HAVE_LIBSIG "0")
 endif()
 
 mark_as_advanced(PATH_LIBSIGC++_H)
diff --git a/tools/cmake/PrintArgs.cmake b/tools/cmake/PrintArgs.cmake
index 258ac3030b..949a6430bc 100644
--- a/tools/cmake/PrintArgs.cmake
+++ b/tools/cmake/PrintArgs.cmake
@@ -128,7 +128,7 @@ message("        Tracing mode ................: ${enable_tracing}")
 message("        Jedule  mode ................: ${enable_jedule}")
 message("        Latency bound ...............: ${enable_latency_bound_tracking}")
 message("        Graphviz mode ...............: ${HAVE_GRAPHVIZ}")
-message("        Sigc++ mode .................: ${HAVE_LIBSIGC++}")
+message("        Sigc++ mode .................: ${SIMGRID_HAVE_LIBSIG}")
 message("        Mallocators .................: ${enable_mallocators}")
 message("")
 message("        Simgrid dependencies ........: ${SIMGRID_DEP}")
diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index 18e40fddcb..3b0b8229af 100644
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -55,9 +55,6 @@
 /* If have linux_futex.h */
 #cmakedefine HAVE_FUTEX_H @HAVE_FUTEX_H@
 
-/* Some variable for libsigc++ */
-#cmakedefine HAVE_LIBSIGC @HAVE_LIBSIGC++@
-
 /* Some variable for graphviz */
 #cmakedefine HAVE_GRAPHVIZ @HAVE_GRAPHVIZ@
 #cmakedefine HAVE_GRAPH_H @GRAPH_H@