A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve MSG_file_read() and MSG_file_write()
[simgrid.git]
/
buildtools
/
Cmake
/
CompleteInFiles.cmake
diff --git
a/buildtools/Cmake/CompleteInFiles.cmake
b/buildtools/Cmake/CompleteInFiles.cmake
index
1c20978
..
ade8857
100644
(file)
--- a/
buildtools/Cmake/CompleteInFiles.cmake
+++ b/
buildtools/Cmake/CompleteInFiles.cmake
@@
-84,6
+84,9
@@
if(enable_java)
find_package(JNI REQUIRED)
message("-- [Java] JNI found: ${JNI_FOUND}")
message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
find_package(JNI REQUIRED)
message("-- [Java] JNI found: ${JNI_FOUND}")
message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
+ find_package(SWIG REQUIRED)
+ include(UseSWIG)
+ message("-- [Java] Swig found: ${SWIG_FOUND}")
set(HAVE_Java 1)
endif()
if(enable_scala)
set(HAVE_Java 1)
endif()
if(enable_scala)
@@
-107,6
+110,8
@@
else()
endif()
# Checks for header libraries functions.
endif()
# Checks for header libraries functions.
+CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_DLOPEN_IN_LIBDL)
+CHECK_LIBRARY_EXISTS(execinfo backtrace "" HAVE_BACKTRACE_IN_LIBEXECINFO)
CHECK_LIBRARY_EXISTS(pthread pthread_create "" pthread)
CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB)
CHECK_LIBRARY_EXISTS(pthread sem_open "" HAVE_SEM_OPEN_LIB)
CHECK_LIBRARY_EXISTS(pthread pthread_create "" pthread)
CHECK_LIBRARY_EXISTS(pthread sem_init "" HAVE_SEM_INIT_LIB)
CHECK_LIBRARY_EXISTS(pthread sem_open "" HAVE_SEM_OPEN_LIB)
@@
-225,11
+230,13
@@
if(enable_model-checking AND HAVE_MMALLOC)
SET(HAVE_MC 1)
SET(MMALLOC_WANT_OVERRIDE_LEGACY 1)
include(FindLibunwind)
SET(HAVE_MC 1)
SET(MMALLOC_WANT_OVERRIDE_LEGACY 1)
include(FindLibunwind)
+ include(FindLibdw)
else()
if(enable_model-checking)
message(STATUS "Warning: support for model-checking has been disabled because HAVE_MMALLOC is false")
endif()
SET(HAVE_MC 0)
else()
if(enable_model-checking)
message(STATUS "Warning: support for model-checking has been disabled because HAVE_MMALLOC is false")
endif()
SET(HAVE_MC 0)
+ SET(HAVE_MMALLOC 0)
SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
endif()
SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
endif()
@@
-249,7
+256,10
@@
CHECK_TYPE_SIZE(void* SIZEOF_VOIDP)
### Check for GNU dynamic linker
CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
if (HAVE_DLFCN_H)
### Check for GNU dynamic linker
CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
if (HAVE_DLFCN_H)
- execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_gnu_dynlinker.c -ldl -o test_gnu_ld
+ if(HAVE_DLOPEN_IN_LIBDL)
+ set(DL_LIBRARY "-ldl")
+ endif(HAVE_DLOPEN_IN_LIBDL)
+ execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_gnu_dynlinker.c ${DL_LIBRARY} -o test_gnu_ld
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
OUTPUT_VARIABLE HAVE_GNU_LD_compil
)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
OUTPUT_VARIABLE HAVE_GNU_LD_compil
)
@@
-420,9
+430,9
@@
endif()
if(WIN32)
if(ARCH_32_BITS)
if(WIN32)
if(ARCH_32_BITS)
- set(mcsc_flags "-D_XBT_WIN32 -D_I_X86_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
+ set(mcsc_flags "-D_XBT_WIN32 -D_I_X86_ -I${CMAKE_HOME_DIRECTORY}/
src/
include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
else()
else()
- set(mcsc_flags "-D_XBT_WIN32 -D_AMD64_ -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
+ set(mcsc_flags "-D_XBT_WIN32 -D_AMD64_ -I${CMAKE_HOME_DIRECTORY}/
src/
include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
endif()
endif()
endif()
endif()
@@
-498,7
+508,7
@@
endif()
###############
## GIT version check
##
###############
## GIT version check
##
-if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/
AND NOT WIN32
)
+if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/)
execute_process(COMMAND git remote
COMMAND head -n 1
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
execute_process(COMMAND git remote
COMMAND head -n 1
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.git/
@@
-561,7
+571,7
@@
if(HAVE_MAKECONTEXT OR WIN32)
else()
set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
endif()
else()
set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
endif()
- set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
+ set(makecontext_CPPFLAGS_2 "-D_XBT_WIN32 -I${CMAKE_HOME_DIRECTORY}/
src/
include/xbt -I${CMAKE_HOME_DIRECTORY}/src/xbt")
endif()
file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
endif()
file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)