X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b733f0e8b01f655eb882b9ec6047314ada533b9..856b580eb05f2a6be5ca81d9f9288ad02c0cab60:/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f5f8f4fb3..ad6b932a67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,22 +1,14 @@
 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")
+project(simgrid CXX C)
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
-set(release_version "3.4")
+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)
 
@@ -24,12 +16,14 @@ find_path(VALGRIND_PATH	NAMES valgrind	PATHS NO_DEFAULT_PATHS)
 SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
 
 ### Set some variables for Cmake
-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(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src") #this one is evil since it speaks to CPack instead
+SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I${CMAKE_CURRENT_BINARY_DIR}/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)