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
Various cleanups in the java world (1/2)
[simgrid.git]
/
examples
/
java
/
priority
/
CMakeLists.txt
diff --git
a/examples/java/priority/CMakeLists.txt
b/examples/java/priority/CMakeLists.txt
index
6d838dd
..
1eb9ee4
100644
(file)
--- a/
examples/java/priority/CMakeLists.txt
+++ b/
examples/java/priority/CMakeLists.txt
@@
-1,5
+1,3
@@
-cmake_minimum_required(VERSION 2.6)
-
set(example java_priority)
set(sources
${CMAKE_CURRENT_SOURCE_DIR}/Priority.java
set(example java_priority)
set(sources
${CMAKE_CURRENT_SOURCE_DIR}/Priority.java
@@
-10,9
+8,10
@@
if(enable_java)
add_custom_command(
COMMENT "Building ${example}..."
OUTPUT ${example}_compiled
add_custom_command(
COMMENT "Building ${example}..."
OUTPUT ${example}_compiled
- DEPENDS ${sources} ${SIMGRID_JAR}
- COMMAND ${JAVA_COMPILE} -c
p
${SIMGRID_JAR}
+ DEPENDS ${sources}
simgrid-java_jar
${SIMGRID_JAR}
+ COMMAND ${JAVA_COMPILE} -c
lasspath
${SIMGRID_JAR}
-d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
-d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+ COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
)
add_custom_target(${example} ALL DEPENDS ${example}_compiled)
COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
)
add_custom_target(${example} ALL DEPENDS ${example}_compiled)
@@
-21,23
+20,12
@@
endif()
set(tesh_files
${tesh_files}
${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh
set(tesh_files
${tesh_files}
${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh
- PARENT_SCOPE
- )
+ PARENT_SCOPE)
set(xml_files
${xml_files}
${CMAKE_CURRENT_SOURCE_DIR}/priorityDeployment.xml
set(xml_files
${xml_files}
${CMAKE_CURRENT_SOURCE_DIR}/priorityDeployment.xml
- PARENT_SCOPE
- )
+ PARENT_SCOPE)
set(examples_src
${examples_src}
${sources}
set(examples_src
${examples_src}
${sources}
- PARENT_SCOPE
- )
-set(bin_files
- ${bin_files}
- PARENT_SCOPE
- )
-set(txt_files
- ${txt_files}
- PARENT_SCOPE
- )
+ PARENT_SCOPE)