The tests also need smpimain and smpireplaymain

They also need the simgrid library, but this is automatically detected
by cmake since the test binaries are linked against this lib.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 850f75f..ee19db8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -756,6 +756,8 @@ include(${CMAKE_HOME_DIRECTORY}/tools/cmake/DefinePackages.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake)
 include(${CMAKE_HOME_DIRECTORY}/tools/cmake/UnitTesting.cmake)
 
+add_custom_target(tests COMMENT "Recompiling the tests")
+
 ### Make Libs
 if(NOT WIN32)
   include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MakeLib.cmake)

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index b1ea27d..ce355d3 100644 (file)
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -101,6 +101,7 @@ if(enable_smpi)
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/simgrid)
   install(TARGETS smpimain # install that binary without breaking the rpath on Mac
     RUNTIME DESTINATION lib/simgrid)
+  add_dependencies(tests smpimain)
 
   add_executable(smpireplaymain src/smpi/smpi_replay_main.cpp)
   target_compile_options(smpireplaymain PRIVATE -fpic)
@@ -109,6 +110,7 @@ if(enable_smpi)
     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/simgrid)
   install(TARGETS smpireplaymain # install that binary without breaking the rpath on Mac
     RUNTIME DESTINATION lib/simgrid)
+  add_dependencies(tests smpireplaymain)
 
   if(SMPI_FORTRAN)
     if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 05c1c54..d0200dd 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -1,5 +1,3 @@
-add_custom_target(tests COMMENT "Recompiling the tests")
-
 IF(enable_smpi AND NOT WIN32)
   execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc)
   execute_process(COMMAND chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicxx)