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
align detection of lua in autotools with what's done in cmake
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
af0ff37
..
4364613
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,17
+1,18
@@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.6)
+exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
SET(CMAKE_LANGUAGE "Cxx")
SET(PROJECT_NAME "Simgrid")
SET(PROJECT_LABEL "Simgrid")
SET(CMAKE_LANGUAGE "Cxx")
SET(PROJECT_NAME "Simgrid")
SET(PROJECT_LABEL "Simgrid")
-set(simgrid_version "3.4")
-set(USE_RPATH false)
+set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(release_version "3.4.1")
+set(libsimgrid_version "${release_version}")
+set(libgras_version "${release_version}")
+set(libsmpi_version "${release_version}")
### Find programs and paths
find_program(SH_EXE NAMES sh)
find_program(SED_EXE NAMES sed)
find_program(PWD_EXE NAMES pwd)
### Find programs and paths
find_program(SH_EXE NAMES sh)
find_program(SED_EXE NAMES sed)
find_program(PWD_EXE NAMES pwd)
-find_program(UNAME NAMES uname)
-find_program(HOSTNAME_CMD NAMES hostname)
-find_program(CAT NAMES cat)
find_path(GCC_PATH NAMES gcc PATHS NO_DEFAULT_PATHS)
find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
find_path(VALGRIND_PATH NAMES valgrind PATHS NO_DEFAULT_PATHS)
find_path(GCC_PATH NAMES gcc PATHS NO_DEFAULT_PATHS)
find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS)
find_path(VALGRIND_PATH NAMES valgrind PATHS NO_DEFAULT_PATHS)
@@
-50,6
+51,11
@@
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.txt)
### Make Libs and Exes
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
### Make Libs and Exes
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeMakeExeLib.txt)
+### Make Simgrid.jar and Java examples
+if(HAVE_JAVA)
+ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeJarAndClass.txt)
+endif(HAVE_JAVA)
+
### Make tests
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
### Make tests
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeTest.txt)
include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CTestConfig.cmake)
@@
-74,6
+80,5
@@
foreach(test ${LIST_OF_TEST})
string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test}) #for ctest version 2.8
string(STRIP ${test} test)
set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}")
string(REGEX REPLACE "^.*Test.*\\:+" " " test ${test}) #for ctest version 2.8
string(STRIP ${test} test)
set_tests_properties(${test} PROPERTIES LABELS "rev${SVN_VERSION}")
- message("${test}")
endif(test_ok_1 OR test_ok_2)
endforeach(test ${LIST_OF_TEST})
endif(test_ok_1 OR test_ok_2)
endforeach(test ${LIST_OF_TEST})