Fix build on Debian/kFreeBSD.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5abb679..77973cc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,9 +139,9 @@ execute_process(COMMAND ${CMAKE_LINKER} -version OUTPUT_VARIABLE LINKER_VERSION
 string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
 
 ### Set the library providing dlopen
 string(REGEX MATCH "[0-9].[0-9]*" LINKER_VERSION "${LINKER_VERSION}")
 
 ### Set the library providing dlopen

-if("${CMAKE_SYSTEM}" MATCHES "Linux")
+if("${CMAKE_SYSTEM_NAME}" MATCHES "kFreeBSD|Linux")

   find_library(DL_LIBRARY dl)
   find_library(DL_LIBRARY dl)

-endif("${CMAKE_SYSTEM}" MATCHES "Linux")
+endif()

 
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)
 
 ### Find programs and paths
 FIND_PROGRAM(GCOV_PATH gcov)

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 1a92e35..eed2ff7 100644 (file)
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -77,7 +77,7 @@ if(HAVE_POSIX_GETTIME)
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
 endif()
 
   SET(SIMGRID_DEP "${SIMGRID_DEP} -lrt")
 endif()
 

-if("${CMAKE_SYSTEM}" MATCHES "FreeBSD")
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")

   set(SIMGRID_DEP "${SIMGRID_DEP} -lprocstat")
 endif()
 
   set(SIMGRID_DEP "${SIMGRID_DEP} -lprocstat")
 endif()