Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / tools / cmake / Modules / FindLibSigc++.cmake

diff --git a/tools/cmake/Modules/FindLibSigc++.cmake b/tools/cmake/Modules/FindLibSigc++.cmake
index 2d2aa03..55de343 100644 (file)
--- a/tools/cmake/Modules/FindLibSigc++.cmake
+++ b/tools/cmake/Modules/FindLibSigc++.cmake
@@ -12,7 +12,7 @@ find_path(PATH_LIBSIGC++_H "sigc++/sigc++.h"
 find_path(PATH_LIBSIGC++CONFIG_H "sigc++config.h"
   HINTS
   $ENV{LD_LIBRARY_PATH}
-  PATH_SUFFIXES lib/x86_64-linux-gnu/sigc++-2.0/include/ include/
+  PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE}/sigc++-2.0/include/ include/
   PATHS
   /opt
   /opt/local
@@ -24,7 +24,7 @@ find_library(PATH_LIBSIGC++_LIB
   NAMES sigc-2.0
   HINTS
   $ENV{LD_LIBRARY_PATH}
-  PATH_SUFFIXES lib/x86_64-linux-gnu/ lib/sigc++/ lib/
+  PATH_SUFFIXES lib/${CMAKE_LIBRARY_ARCHITECTURE}/ lib/sigc++/ lib/
   PATHS
   /opt
   /opt/local
@@ -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)