summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
d32b7bd)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7306
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/bin")
set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/.libs")
SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/bin")
set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/.libs")
-set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include -L${gtnets_path}/lib")
+set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include/ -L${gtnets_path}/lib")
set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
endif(JAVA_INCLUDE_PATH)
if(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
SET(HAVE_JAVA 1)
endif(JAVA_INCLUDE_PATH)
if(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
SET(HAVE_JAVA 1)
- if(CMAKE_SYSTEM_NAME MATCHES "Darwin") #JAVA doesn't work yet on Mac
- SET(HAVE_JAVA 0)
- endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
else(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
SET(HAVE_JAVA 0)
endif(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
else(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
SET(HAVE_JAVA 0)
endif(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
NAMES lualib.h
PATHS "/sw/include/" "/usr/include/lua5.1/"
)
NAMES lualib.h
PATHS "/sw/include/" "/usr/include/lua5.1/"
)
- if(HAVE_LUA5_1_LUALIB_H)
+ find_path(HAVE_LUA5_1_LAUXLIB_H
+ NAMES lauxlib.h
+ PATHS "/sw/include/" "/usr/include/lua5.1/"
+ )
+ if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
- endif(HAVE_LUA5_1_LUALIB_H)
+ endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
endif(NOT disable_lua)
#message("HAVE_LUA ${HAVE_LUA}")
endif(NOT disable_lua)
#message("HAVE_LUA ${HAVE_LUA}")
+#message("${HAVE_LUA5_1_LUALIB_H} AND ${HAVE_LUA5_1_LAUXLIB_H}")
#message("______END_CONTEXT______")
#message("______END_CONTEXT______")
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgException.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ApplicationHandler.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Host.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/HostFailureException.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/HostNotFoundException.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/JniException.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/JniException.java
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/NativeException.java
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/HostNotFoundException.java
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ProcessNotFoundException.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/Msg.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/Msg.java
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Process.java
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Host.java
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Task.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgException.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgNative.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgNative.java
- ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ApplicationHandler.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/NativeException.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Process.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ProcessNotFoundException.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/Sem.java
${PROJECT_DIRECTORY}/src/java/simgrid/msg/Sem.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Task.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/TimeoutException.java
+ ${PROJECT_DIRECTORY}/src/java/simgrid/msg/TransferFailureException.java
+