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
Give LD_LIBRARY_PATH to smpirun.
[simgrid.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
eb72ca5
..
a8ac91d
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-9,8
+9,8
@@
set(libgras_version "${release_version}")
set(libsmpi_version "${release_version}")
### Find programs and paths
set(libsmpi_version "${release_version}")
### Find programs and paths
-
find_path(GCOV_PATH NAMES gcov PATHS NO_DEFAULT_PATHS
)
-
find_path(VALGRIND_PATH NAMES valgrind PATHS NO_DEFAULT_PATHS
)
+
FIND_PROGRAM(GCOV_PATH gcov
)
+
FIND_PROGRAM(VALGRIND_PATH valgrind
)
### SET THE PROJECT_DIRECTORY
SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
### SET THE PROJECT_DIRECTORY
SET(PROJECT_DIRECTORY "${CMAKE_HOME_DIRECTORY}")
@@
-49,23
+49,34
@@
if(WIN32)
message(" -- CMAKE_BUILD_TOOL ${CMAKE_BUILD_TOOL}")
message(" -- LINKER ${CMAKE_LINKER}")
message(" -- CMAKE_GENERATOR ${CMAKE_GENERATOR}")
message(" -- CMAKE_BUILD_TOOL ${CMAKE_BUILD_TOOL}")
message(" -- LINKER ${CMAKE_LINKER}")
message(" -- CMAKE_GENERATOR ${CMAKE_GENERATOR}")
- message(" -- INCLUDES ${INCLUDES}
\n\n
")
-
set(__STRICT_ANSI__ 1
)
-
set(_MSC_VER 1
)
-
set(_XBT_WIN32 1
)
+ message(" -- INCLUDES ${INCLUDES}")
+
message(" -- BORLAND ${BORLAND}"
)
+
message(" -- VISUALC ${MSVC}"
)
+
message(" -- GNUC ${CMAKE_COMPILER_IS_GNUCC}\n\n"
)
if(BORLAND) ### BORLAND COMPILER
set(__BORLANDC__ 1)
set(_XBT_BORLANDC_COMPILER 1)
endif(BORLAND)
if(BORLAND) ### BORLAND COMPILER
set(__BORLANDC__ 1)
set(_XBT_BORLANDC_COMPILER 1)
endif(BORLAND)
- if(MSVC_VERSION) ### MicroSoftVisualC COMPILER
+
+ if(MSVC) ### MicroSoftVisualC COMPILER
set(__VISUALC__ 1)
set(_XBT_VISUALC_COMPILER 1)
set(__VISUALC__ 1)
set(_XBT_VISUALC_COMPILER 1)
- endif(MSVC_VERSION)
+ set(_MSC_VER 1)
+ set(__STRICT_ANSI__ 1)
+ set(_M_IX86 1)
+ endif(MSVC)
+
+ if(CMAKE_COMPILER_IS_GNUCC)
+ set(__GNUC__ 1)
+ endif(CMAKE_COMPILER_IS_GNUCC)
+
if(ARCH_32_BITS) ### Arch 32bits
if(ARCH_32_BITS) ### Arch 32bits
- set(_WIN32 1)
+
set(_WIN32 1)
else(ARCH_32_BITS) ### Arch 64bits
else(ARCH_32_BITS) ### Arch 64bits
- set(_WIN64 1)
+
set(_WIN64 1)
endif(ARCH_32_BITS)
endif(ARCH_32_BITS)
+
+ set(_XBT_WIN32 1)
endif(WIN32)
add_definitions (${INCLUDES})
endif(WIN32)
add_definitions (${INCLUDES})
@@
-86,12
+97,16
@@
include(${PROJECT_DIRECTORY}/buildtools/Cmake/MaintainerMode.cmake)
include(${PROJECT_DIRECTORY}/buildtools/Cmake/Flags.cmake)
### Make Libs and Exes
include(${PROJECT_DIRECTORY}/buildtools/Cmake/Flags.cmake)
### Make Libs and Exes
-include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake)
+if(WIN32)
+ include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLibWin.cmake)
+else(WIN32)
+ include(${PROJECT_DIRECTORY}/buildtools/Cmake/MakeExeLib.cmake)
+endif(WIN32)
### Build the doc
if(enable_doc)
ADD_CUSTOM_COMMAND(
### Build the doc
if(enable_doc)
ADD_CUSTOM_COMMAND(
- OUTPUT ${PROJECT_DIRECTORY}/doc/html
/index.html
+ OUTPUT ${PROJECT_DIRECTORY}/doc/html
DEPENDS ${PROJECT_DIRECTORY}/doc/FAQ.doc
${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake
${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeLists.txt
DEPENDS ${PROJECT_DIRECTORY}/doc/FAQ.doc
${PROJECT_DIRECTORY}/buildtools/Cmake/GenerateDoc.cmake
${PROJECT_DIRECTORY}/buildtools/Cmake/doc/CMakeLists.txt
@@
-99,7
+114,7
@@
if(enable_doc)
COMMENT "Generating the simgrid documentation..."
)
ADD_CUSTOM_TARGET(simgrid_documentation ALL
COMMENT "Generating the simgrid documentation..."
)
ADD_CUSTOM_TARGET(simgrid_documentation ALL
- DEPENDS ${PROJECT_DIRECTORY}/doc/html
/index.html
)
+ DEPENDS ${PROJECT_DIRECTORY}/doc/html)
endif(enable_doc)
### Make Simgrid.jar and Java examples
endif(enable_doc)
### Make Simgrid.jar and Java examples
@@
-114,6
+129,9
@@
include(${PROJECT_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
### Setup the distrib
include(${PROJECT_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
### Setup the distrib
include(${PROJECT_DIRECTORY}/buildtools/Cmake/Distrib.cmake)
+### Pipol compilation
+include(${PROJECT_DIRECTORY}/buildtools/Cmake/Pipol.cmake)
+
### Print ARGS
include(${PROJECT_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)
### Print ARGS
include(${PROJECT_DIRECTORY}/buildtools/Cmake/PrintArgs.cmake)