X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/70855917af3ad1d91f5798dcaee89452570f3717..1180bb9c605c2c429e8339be413574876893637e:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af0ff37a63..d4a17f13ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,14 @@
 cmake_minimum_required(VERSION 2.6)
-SET(CMAKE_LANGUAGE "Cxx")
-SET(PROJECT_NAME "Simgrid")
-SET(PROJECT_LABEL "Simgrid")
-set(simgrid_version "3.4")
-set(USE_RPATH false)
+exec_program("rm ${Project_BINARY_DIR}/CTestTestfile.cmake" OUTPUT_VARIABLE rmok)
+project(Simgrid CXX C)
+set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
+set(release_version "3.5")
+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_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)
 
@@ -23,9 +19,12 @@ SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 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")
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
+if(EXISTS /usr/include/)
+	set(INCLUDES "${INCLUDES} -I/usr/include/")
+endif(EXISTS /usr/include/)
 
 if(enable_coverage)
 	add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
@@ -50,6 +49,11 @@ include(${PROJECT_DIRECTORY}/buildtools/Cmake/src/CMakeFlags.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)
@@ -74,6 +78,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}")
-		message("${test}")
 	endif(test_ok_1 OR test_ok_2)
 endforeach(test ${LIST_OF_TEST})