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
add a CMakeCustom.cmake file, which is automatically used by ctest to handle custom...
[simgrid.git]
/
buildtools
/
Cmake
/
Option.cmake
diff --git
a/buildtools/Cmake/Option.cmake
b/buildtools/Cmake/Option.cmake
index
9a66066
..
79329fc
100644
(file)
--- a/
buildtools/Cmake/Option.cmake
+++ b/
buildtools/Cmake/Option.cmake
@@
-7,9
+7,9
@@
set(ns3_path ${ns3_path} CACHE PATH "Path to ns3 lib and include")
if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
if(NOT CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
-else(
NOT CMAKE_INSTALL_PREFIX
)
+else()
set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Path where to install project")
-endif(
NOT CMAKE_INSTALL_PREFIX
)
+endif()
set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
set(pipol_user ${pipol_user} CACHE TYPE INTERNAL FORCE)
@@
-37,9
+37,9
@@
option(enable_msg_deprecated "This option enable the use of msg deprecated funct
if(WIN32)
option(enable_smpi "Whether the smpi library is compiled." off)
if(WIN32)
option(enable_smpi "Whether the smpi library is compiled." off)
-else(
WIN32
)
+else()
option(enable_smpi "Whether the smpi library is compiled." on)
option(enable_smpi "Whether the smpi library is compiled." on)
-endif(
WIN32
)
+endif()
mark_as_advanced(HAVE_SSH)
mark_as_advanced(HAVE_RSYNC)
mark_as_advanced(HAVE_SSH)
mark_as_advanced(HAVE_RSYNC)
@@
-69,3
+69,5
@@
mark_as_advanced(CMAKE_OSX_SYSROOT)
mark_as_advanced(SED_EXE)
mark_as_advanced(BIBTEX2HTML)
mark_as_advanced(CMAKE_C_LINK_FLAGS)
mark_as_advanced(SED_EXE)
mark_as_advanced(BIBTEX2HTML)
mark_as_advanced(CMAKE_C_LINK_FLAGS)
+mark_as_advanced(CMAKE_CXX_FLAGS)
+mark_as_advanced(CMAKE_Fortran_LINK_FLAGS)