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_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)
+ SET(HAVE_MMALLOC 0)
SET(MMALLOC_WANT_OVERRIDE_LEGACY 0)
endif()
# AC_CHECK_MCSC(mcsc=yes, mcsc=no)
set(mcsc_flags "")
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
- set(mcsc_flags "-D_XOPEN_SOURCE")
+ set(mcsc_flags -D_XOPEN_SOURCE)
endif()
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()
- 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()
file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c ${mcsc_flags} -o testprog
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
- OUTPUT_VARIABLE COMPILE_mcsc_VAR)
+ OUTPUT_VARIABLE COMPILE_mcsc_VAR ERROR_VARIABLE COMPILE_mcsc_VAR)
if(NOT COMPILE_mcsc_VAR)
message(STATUS "prog_AC_CHECK_MCSC.c is compilable")
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)