find llvm correctly on msys, fix #878

ossia · Dec 8, 2018 · d4b858a · d4b858a
1 parent f48b245
commit d4b858a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CMake/modules/FindFaust.cmake b/CMake/modules/FindFaust.cmake
@@ -42,11 +42,16 @@ if(FAUST_FOUND)
             return()
         endif()
 
-        exec_program(${LLVM_CONFIG} ARGS --includedir OUTPUT_VARIABLE LLVM_DIR)
-        exec_program(${LLVM_CONFIG} ARGS --libs OUTPUT_VARIABLE LLVM_LIBS)
-        exec_program(${LLVM_CONFIG} ARGS --version OUTPUT_VARIABLE LLVM_VERSION)
-        exec_program(${LLVM_CONFIG} ARGS --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS)
+        exec_program(${LLVM_CONFIG} ARGS "--includedir" OUTPUT_VARIABLE LLVM_DIR)
+        exec_program(${LLVM_CONFIG} ARGS "--libs" OUTPUT_VARIABLE LLVM_LIBS)
+        exec_program(${LLVM_CONFIG} ARGS "--version" OUTPUT_VARIABLE LLVM_VERSION)
+        exec_program(${LLVM_CONFIG} ARGS "--ldflags" OUTPUT_VARIABLE LLVM_LDFLAGS)
 
+        if(MSYS)
+          string(REGEX REPLACE "([a-zA-Z]):" "/\\1" LLVM_LDFLAGS "${LLVM_LDFLAGS}")
+          string(REPLACE "\\" "/" LLVM_LDFLAGS "${LLVM_LDFLAGS}")
+        endif()
+
         set(LLVM_VERSION LLVM_${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR})
 
         if(MINGW)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -85,7 +85,7 @@ else()
 endif()
 
 if(MSYS OR MINGW)
-  find_package(ZLIB)
+  find_package(ZLIB REQUIRED)
 endif()
 
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/API" )

diff --git a/base/plugins/score-plugin-scenario/Scenario/Process/ScenarioGlobalCommandManager.cpp b/base/plugins/score-plugin-scenario/Scenario/Process/ScenarioGlobalCommandManager.cpp
@@ -230,7 +230,7 @@ bool EndDateComparator::
 operator()(const IntervalModel* lhs, const IntervalModel* rhs) const
 {
   return (Scenario::date(*lhs, *scenario) + lhs->duration.defaultDuration())
-         <= (Scenario::date(*rhs, *scenario)
+         < (Scenario::date(*rhs, *scenario)
              + rhs->duration.defaultDuration());
 }
 }
diff --git a/base/plugins/score-plugin-scenario/Scenario/Process/ScenarioGlobalCommandManager.hpp b/base/plugins/score-plugin-scenario/Scenario/Process/ScenarioGlobalCommandManager.hpp
@@ -44,7 +44,7 @@ struct StartDateComparator
   const Scenario::ProcessModel* scenario;
   bool operator()(const T* lhs, const T* rhs) const
   {
-    return Scenario::date(*lhs, *scenario) <= Scenario::date(*rhs, *scenario);
+    return Scenario::date(*lhs, *scenario) < Scenario::date(*rhs, *scenario);
   }
 };