try to support more build configurations

ossia · Jun 1, 2018 · 612a91c · 612a91c
1 parent 500335b
commit 612a91c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CMake/modules/FindFFmpeg.cmake b/CMake/modules/FindFFmpeg.cmake
@@ -68,6 +68,7 @@ macro(find_component _component _pkgconfig _library _header)
       ${PC_${_component}_INCLUDEDIR}
       ${PC_${_component}_INCLUDE_DIRS}
       c:/ffmpeg/include
+      /opt/ffmpeg/include
     PATH_SUFFIXES
       ffmpeg
   )

diff --git a/CMake/modules/FindFaust.cmake b/CMake/modules/FindFaust.cmake
@@ -50,10 +50,12 @@ if(FAUST_FOUND)
         if(NOT MSVC AND NOT APPLE)
           find_package(OpenSSL REQUIRED)
           set(FAUST_LIBRARIES ${FAUST_LIBRARIES} ${CMAKE_DL_LIBS} ${OPENSSL_LIBRARIES} curses z ${LLVM_LDFLAGS} ${LLVM_LIBS} )
+        elseif(APPLE)
+          string(REGEX REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS})
+          set(FAUST_LIBRARIES ${FAUST_LIBRARIES} ${LLVM_LDFLAGS} ${LLVM_LIBS} curses z)
         else()
           string(REGEX REPLACE " " ";" LLVM_LIBS ${LLVM_LIBS})
-          # set(FAUST_LIBRARIES ${FAUST_LIBRARIES} ${LLVM_LDFLAGS} ${LLVM_LIBS} )
-          set(FAUST_LIBRARIES ${FAUST_LIBRARIES} )
+          set(FAUST_LIBRARIES ${FAUST_LIBRARIES})
         endif()
     endif()
 else()

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,4 @@
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 set(CMAKE_MODULE_PATH
   "${CMAKE_MODULE_PATH}"
   "${CMAKE_CURRENT_SOURCE_DIR}/CMake"
@@ -17,8 +18,8 @@ endif()
 include("${SCORE_CONFIGURATION}")
 project(score LANGUAGES C CXX)
 
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
 cmake_policy(VERSION 3.9)
+cmake_policy(SET CMP0025 NEW)
 
 set(SCORE_VERSION_MAJOR 2)
 set(SCORE_VERSION_MINOR 0)