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
somehow prepare the next dot release
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
41f6c7a
..
3ef54ab
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-105,9
+105,9
@@
endif()
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
set(SIMGRID_VERSION_MAJOR "3")
-set(SIMGRID_VERSION_MINOR "1
8
")
-set(SIMGRID_VERSION_PATCH "
90
")
-set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
+set(SIMGRID_VERSION_MINOR "1
9
")
+set(SIMGRID_VERSION_PATCH "
1
")
+
#
set(SIMGRID_VERSION_EXTRA "-DEVEL") # Extra words to add to version string (e.g. -rc1)
set(SIMGRID_VERSION_DATE "2018") # Year for copyright information
set(SIMGRID_VERSION_DATE "2018") # Year for copyright information
@@
-159,20
+159,26
@@
endif()
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
### Compute the include paths
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
### Compute the include paths
-set(INCLUDES
+
+# Only include public headers by default
+include_directories(
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_HOME_DIRECTORY}/include
+)
+
+# Compute the ones that should be added when compiling the library
+set(INTERNAL_INCLUDES
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/include
${CMAKE_HOME_DIRECTORY}
${CMAKE_HOME_DIRECTORY}
- ${CMAKE_HOME_DIRECTORY}/include
${CMAKE_HOME_DIRECTORY}/src/include
)
if(enable_smpi)
${CMAKE_HOME_DIRECTORY}/src/include
)
if(enable_smpi)
- set (IN
CLUDES ${
INCLUDES} ${CMAKE_HOME_DIRECTORY}/src/smpi/include)
+ set (IN
TERNAL_INCLUDES ${INTERNAL_
INCLUDES} ${CMAKE_HOME_DIRECTORY}/src/smpi/include)
endif()
if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
endif()
if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/)
- set(IN
CLUDES ${
INCLUDES} /usr/include/)
+ set(IN
TERNAL_INCLUDES ${INTERNAL_
INCLUDES} /usr/include/)
endif()
if(WIN32)
endif()
if(WIN32)
@@
-180,12
+186,10
@@
if(WIN32)
set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}")
string(REGEX REPLACE "/bin/gcc.*" "/include" CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
string(REGEX REPLACE "/bin/gcc.*" "/lib" CMAKE_LIB_WIN "${CMAKE_LIB_WIN}")
set(CMAKE_LIB_WIN "${CMAKE_C_COMPILER}")
string(REGEX REPLACE "/bin/gcc.*" "/include" CMAKE_INCLUDE_WIN "${CMAKE_INCLUDE_WIN}")
string(REGEX REPLACE "/bin/gcc.*" "/lib" CMAKE_LIB_WIN "${CMAKE_LIB_WIN}")
- set(IN
CLUDES ${
INCLUDES} ${CMAKE_INCLUDE_WIN})
+ set(IN
TERNAL_INCLUDES ${INTERNAL_
INCLUDES} ${CMAKE_INCLUDE_WIN})
unset(CMAKE_INCLUDE_WIN)
endif()
unset(CMAKE_INCLUDE_WIN)
endif()
-include_directories(${INCLUDES})
-
# library dependency cannot start with a space (CMP0004), so initialize it with something that is never desactivated.
set(SIMGRID_DEP "-lm")
# library dependency cannot start with a space (CMP0004), so initialize it with something that is never desactivated.
set(SIMGRID_DEP "-lm")