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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
buildtools
/
Cmake
/
CompleteInFiles.cmake
diff --git
a/buildtools/Cmake/CompleteInFiles.cmake
b/buildtools/Cmake/CompleteInFiles.cmake
index
df8b11b
..
9a098a0
100644
(file)
--- a/
buildtools/Cmake/CompleteInFiles.cmake
+++ b/
buildtools/Cmake/CompleteInFiles.cmake
@@
-75,10
+75,6
@@
TEST_BIG_ENDIAN(BIGENDIAN)
include(FindGraphviz)
include(FindLibSigc++)
include(FindGraphviz)
include(FindLibSigc++)
-set(HAVE_GTNETS 0)
-if(enable_gtnets)
- include(FindGTnets)
-endif()
if(enable_java)
find_package(Java REQUIRED COMPONENTS Runtime Development)
find_package(JNI REQUIRED)
if(enable_java)
find_package(Java REQUIRED COMPONENTS Runtime Development)
find_package(JNI REQUIRED)
@@
-99,9
+95,20
@@
endif()
if(enable_lua)
include(FindLua51Simgrid)
endif()
if(enable_lua)
include(FindLua51Simgrid)
endif()
+
+set(HAVE_GTNETS 0)
+if(enable_gtnets)
+ include(FindGTnets)
+ if (NOT HAVE_GTNETS)
+ message(FATAL_ERROR "Cannot find GTNetS. Please install it, or disable that cmake option")
+ endif()
+endif()
set(HAVE_NS3 0)
if(enable_ns3)
include(FindNS3)
set(HAVE_NS3 0)
if(enable_ns3)
include(FindNS3)
+ if (NOT HAVE_NS3)
+ message(FATAL_ERROR "Cannot find NS3. Please install it (apt-get install ns3 libns3-dev) or disable that cmake option")
+ endif()
endif()
# algorithm 1.50.0
endif()
# algorithm 1.50.0
@@
-114,9
+121,9
@@
if(Boost_FOUND)
include_directories(${Boost_INCLUDE_DIRS})
else()
if(APPLE) #MAC
include_directories(${Boost_INCLUDE_DIRS})
else()
if(APPLE) #MAC
- message(FATAL_ERROR
,
"Failed to find Boost libraries (Try to install them with 'sudo fink install boost1.53.nopython')")
+ message(FATAL_ERROR "Failed to find Boost libraries (Try to install them with 'sudo fink install boost1.53.nopython')")
else()
else()
- message(FATAL_ERROR
,
"Failed to find Boost libraries")
+ message(FATAL_ERROR "Failed to find Boost libraries")
endif()
endif()
endif()
endif()
@@
-542,15
+549,15
@@
elseif(EXISTS ${CMAKE_HOME_DIRECTORY}/.gitversion)
endif()
if(release)
endif()
if(release)
- set(SIMGRID_VERSION_
STRING "${SIMGRID_VERSION_STRING
}\\nRelease build")
+ set(SIMGRID_VERSION_
BANNER "${SIMGRID_VERSION_BANNER
}\\nRelease build")
else()
else()
- set(SIMGRID_VERSION_
STRING "${SIMGRID_VERSION_STRING
}\\nDevelopment build")
+ set(SIMGRID_VERSION_
BANNER "${SIMGRID_VERSION_BANNER
}\\nDevelopment build")
endif()
if(GIT_VERSION)
endif()
if(GIT_VERSION)
- set(SIMGRID_VERSION_
STRING "${SIMGRID_VERSION_STRING
} at commit ${GIT_VERSION}")
+ set(SIMGRID_VERSION_
BANNER "${SIMGRID_VERSION_BANNER
} at commit ${GIT_VERSION}")
endif()
if(GIT_DATE)
endif()
if(GIT_DATE)
- set(SIMGRID_VERSION_
STRING "${SIMGRID_VERSION_STRING
} (${GIT_DATE})")
+ set(SIMGRID_VERSION_
BANNER "${SIMGRID_VERSION_BANNER
} (${GIT_DATE})")
endif()
#--------------------------------------------------------------------------------------------------
endif()
#--------------------------------------------------------------------------------------------------