updates

Author: frs69wq

CMakeLists.txt

@@ -6,7 +6,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
 project(dtlmod VERSION 0.1 DESCRIPTION "Data Transport Layer Module")
 
 include(GNUInstallDirs)
-find_package(SimGrid 4.0 REQUIRED)
+find_package(SimGrid 4.0.1 REQUIRED)
 find_package(FSMod 0.3 REQUIRED)
 find_package(nlohmann_json REQUIRED)
 
@@ -76,14 +76,14 @@ if((NOT DEFINED enable_python) OR enable_python)
   find_package(pybind11 CONFIG)
   message(STATUS "Pybind11 version: ${pybind11_VERSION}")
   if (pybind11_VERSION VERSION_LESS 2.4)
-    message(STATUS "SimGrid needs at least v2.4 of pybind11. Disabling the Python bindings.")
+    message(STATUS "DTLMod needs at least v2.4 of pybind11. Disabling the Python bindings.")
     set(pybind11_FOUND OFF)
   endif()
 endif()
 
 find_package(Python3 COMPONENTS Development)
 if(NOT Python3_Development_FOUND OR NOT pybind11_FOUND)
-  message(STATUS "SimGrid Python bindings cannot be built on this system.")
+  message(STATUS "DTLMod Python bindings cannot be built on this system.")
   set(default_enable_python OFF)
 else()
   set(default_enable_python ON)
@@ -118,7 +118,7 @@ if(enable_python)
       if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
         set(DTLMOD_PYTHON_LIBDIR ${Python3_SITEARCH})
       else("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
-        string(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" DTLMOD_PYTHON_LIBDIR ${Python3_SITEARCH})
+        string(REGEX REPLACE "^/usr/local/" "${CMAKE_INSTALL_PREFIX}/" DTLMOD_PYTHON_LIBDIR ${Python3_SITEARCH})
       endif("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr")
     endif()
     install(TARGETS python-bindings
@@ -199,17 +199,18 @@ if(GTEST_LIBRARY)
       test/dtl_stream.cpp
       test/dtl_variable.cpp
       test/main.cpp
-			test/test_util.hpp
-			include/dtlmod.hpp)
-	add_definitions(-DGTEST_USED)
-	add_executable(unit_tests EXCLUDE_FROM_ALL ${SOURCE_FILES} ${HEADER_FILES} ${TEST_FILES})
-	target_include_directories(unit_tests PRIVATE include)
-	target_link_libraries(unit_tests ${GTEST_LIBRARY} ${SIMGRID_LIBRARY} ${FSMOD_LIBRARY} dtlmod -lpthread -lm)
-	set_target_properties(unit_tests PROPERTIES COMPILE_FLAGS "-g -O0 --coverage")
-	set_target_properties(unit_tests PROPERTIES LINK_FLAGS "--coverage")
-	#add_custom_command(TARGET unit_tests COMMAND find . -name *.gcda -delete)
+      test/test_util.hpp
+      include/dtlmod.hpp)
+      
+  add_definitions(-DGTEST_USED)
+  add_executable(unit_tests EXCLUDE_FROM_ALL ${SOURCE_FILES} ${HEADER_FILES} ${TEST_FILES})
+  target_include_directories(unit_tests PRIVATE include)
+  target_link_libraries(unit_tests ${GTEST_LIBRARY} ${SIMGRID_LIBRARY} ${FSMOD_LIBRARY} dtlmod -lpthread -lm)
+  set_target_properties(unit_tests PROPERTIES COMPILE_FLAGS "-g -O0 --coverage")
+  set_target_properties(unit_tests PROPERTIES LINK_FLAGS "--coverage")
+  #add_custom_command(TARGET unit_tests COMMAND find . -name *.gcda -delete)
 else()
-	add_custom_target(unit_tests echo "ERROR: Cannot build unit_tests because Google Test (libgtest) was not found by cmake." COMMAND echo "       If you have installed Google Test, re-run cmake." VERBATIM)
+  add_custom_target(unit_tests echo "ERROR: Cannot build unit_tests because Google Test (libgtest) was not found by cmake." COMMAND echo "       If you have installed Google Test, re-run cmake." VERBATIM)
 endif()
 
 # Documentation
@@ -218,7 +219,7 @@ include(${CMAKE_HOME_DIRECTORY}/conf/cmake/Documentation.cmake)
 if(pybind11_FOUND)
   message("        Compile Python bindings .....: ${enable_python}")
   message("          module ....................: ${PYTHON_MODULE_PREFIX}dtlmod${PYTHON_MODULE_EXTENSION}")
-  message("          install path ..............: ${SIMGRID_PYTHON_LIBDIR} (force another value with -DSIMGRID_PYTHON_LIBDIR)")
+  message("          install path ..............: ${DTLMOD_PYTHON_LIBDIR} (force another value with -DDTLMOD_PYTHON_LIBDIR)")
 else()
   message("        Compile Python bindings .....: OFF (disabled, or pybind11 not found)")
 endif()