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
Change cmake variable HAVE_RUBY_H to HAVE_RUBY for homogeneity with other variables
[simgrid.git]
/
buildtools
/
Cmake
/
src
/
CMakeMakeExeLib.txt
diff --git
a/buildtools/Cmake/src/CMakeMakeExeLib.txt
b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index
2ea5548
..
060c256
100644
(file)
--- a/
buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/
buildtools/Cmake/src/CMakeMakeExeLib.txt
@@
-13,11
+13,11
@@
set(GRAS_DEP "pthread")
set(SIMGRID_DEP ${libruby})
set(SMPI_DEP "")
set(SIMGRID_DEP ${libruby})
set(SMPI_DEP "")
-if(HAVE_RUBY
_H
)
- add_library(simgrid_ruby S
TATIC
${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
+if(HAVE_RUBY)
+ add_library(simgrid_ruby S
HARED
${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
set(RUBY_DEP "-lm -module")
target_link_libraries(simgrid_ruby simgrid ${RUBY_DEP} -fprofile-arcs)
set(RUBY_DEP "-lm -module")
target_link_libraries(simgrid_ruby simgrid ${RUBY_DEP} -fprofile-arcs)
-endif(HAVE_RUBY
_H
)
+endif(HAVE_RUBY)
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
add_definitions("-D_XOPEN_SOURCE")
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
add_definitions("-D_XOPEN_SOURCE")
@@
-47,10
+47,10
@@
if(HAVE_POSIX_GETTIME)
SET(GRAS_DEP "${GRAS_DEP} -lrt")
endif(HAVE_POSIX_GETTIME)
SET(GRAS_DEP "${GRAS_DEP} -lrt")
endif(HAVE_POSIX_GETTIME)
-if(NOT HAVE_RUBY
_H
)
+if(NOT HAVE_RUBY)
string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
string(REPLACE "${libruby} -l" "" SIMGRID_DEP ${SIMGRID_DEP})
string(REPLACE "${libruby}" "" SIMGRID_DEP ${SIMGRID_DEP})
-endif(NOT HAVE_RUBY
_H
)
+endif(NOT HAVE_RUBY)
target_link_libraries(simgrid ${SIMGRID_DEP} -fprofile-arcs)
target_link_libraries(simgrid_static ${SIMGRID_DEP} -fprofile-arcs)
target_link_libraries(simgrid ${SIMGRID_DEP} -fprofile-arcs)
target_link_libraries(simgrid_static ${SIMGRID_DEP} -fprofile-arcs)
@@
-63,6
+63,11
@@
target_link_libraries(smpi simgrid ${SMPI_DEP} -fprofile-arcs)
### Make EXEs
### Make EXEs
+if(enable_maintainer_mode)
+#src
+add_subdirectory(${PROJECT_DIRECTORY}/src)
+endif(enable_maintainer_mode)
+
#tools
#tools/gras
add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
#tools
#tools/gras
add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)