Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
testing tuto: fix for freebsd make version
authorMartin Quinson <martin.quinson@loria.fr>
Sat, 10 Mar 2018 10:06:18 +0000 (11:06 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Sat, 10 Mar 2018 10:06:18 +0000 (11:06 +0100)
doc/tuto-msg/Makefile
tools/cmake/Tests.cmake

index 665ba9c..5d17b10 100644 (file)
@@ -28,10 +28,6 @@ CFLAGS = -std=gnu99 -g -O2 $(WARNINGS) $(EXTRA_CFLAGS) # Use this line to get be
 # the targets for which you listed the dependencies above.
 
 # The blanks before the $(CC) must be a Tab char, not spaces
-%: %.o
-       $(CC) -L$(strip $(SIMGRID_INSTALL_PATH))/lib/    $(CFLAGS) $^ -lsimgrid -o $@
-%.o: %.c
-       $(CC) -I$(strip $(SIMGRID_INSTALL_PATH))/include $(CFLAGS) -c -o $@ $<
 %: %.c
        $(CC) -I$(strip $(SIMGRID_INSTALL_PATH))/include -L$(strip $(SIMGRID_INSTALL_PATH))/lib/  $(CFLAGS) $^ -lsimgrid -o $@ 
 
index 4f4169c..391e665 100644 (file)
@@ -100,7 +100,7 @@ endif()
 
 # Also test the tutorial, if SIMGRID_INSTALL_PATH is defined and gcc used
 set(tuto-path "${CMAKE_SOURCE_DIR}/doc/tuto-msg")
-set(tuto-make "make -C ${tuto-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=\"-I${CMAKE_BINARY_DIR}/include -L${CMAKE_BINARY_DIR}/lib\"")
+set(tuto-make "make -C ${tuto-path} CC=${CMAKE_C_COMPILER} EXTRA_CFLAGS=\"-I${CMAKE_HOME_DIRECTORY}/include -I${CMAKE_BINARY_DIR}/include -L${CMAKE_BINARY_DIR}/lib\"")
 ADD_TEST(tuto-msg-0 sh -xc "${tuto-make} masterworker      && ${tuto-path}/masterworker      ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment0.xml")
 ADD_TEST(tuto-msg-1 sh -xc "${tuto-make} masterworker-sol1 && ${tuto-path}/masterworker-sol1 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment1.xml")
 ADD_TEST(tuto-msg-2 sh -xc "${tuto-make} masterworker-sol2 && ${tuto-path}/masterworker-sol2 ${CMAKE_SOURCE_DIR}/examples/platforms/small_platform.xml ${tuto-path}/deployment2.xml")