X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dd5510128a21934443941b3545700d7d28c410a6..e581b2ad1ed170f3b7f64b7db3d0f5c80c173437:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index f12299e663..b68c5034ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,6 +58,7 @@ else() endif() set(libsimgrid_version "${release_version}") set(libsmpi_version "${release_version}") +set(libSG_java_version "${release_version}") set(GCC_NEED_VERSION "4.0") set(APPLE_NEED_GCC_VERSION "4.6") @@ -73,8 +74,7 @@ else() endif() endif() -string(REGEX MATCH "gcc" GCC "${CMAKE_C_COMPILER}") -if(GCC) +if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION") exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION") string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}") @@ -190,10 +190,6 @@ endif() include_directories(${INCLUDES}) -### Determine the assembly flavor that we need today -include(CMakeDetermineSystem) -set(PROCESSOR_${CMAKE_SYSTEM_PROCESSOR} 1) - ### Setup Options include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake)