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
MC: rename process into RemoteClient
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
58d7dbb
..
7dea4f7
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-105,7
+105,7
@@
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "1
6
")
+set(SIMGRID_VERSION_MINOR "1
7
")
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_PATCH "0")
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
@@
-160,11
+160,11
@@
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
### Compute the include paths
set(INCLUDES
### Compute the include paths
set(INCLUDES
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/include
${CMAKE_HOME_DIRECTORY}
${CMAKE_HOME_DIRECTORY}/include
${CMAKE_HOME_DIRECTORY}/src/include
${CMAKE_HOME_DIRECTORY}
${CMAKE_HOME_DIRECTORY}/include
${CMAKE_HOME_DIRECTORY}/src/include
- ${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/include
)
if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
)
if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)