From 952d511655d57a0b3ddb5d20a67b3056a613c3ec Mon Sep 17 00:00:00 2001 From: sezero Date: Tue, 8 Oct 2019 14:35:24 +0300 Subject: [PATCH] cmake: fix nasm sources build when building in a separate directory When building in the same directory as the source, it works, but not in a separate directory. The trailing slash is important with nasm. Note that include_directories("${CMAKE_CURRENT_SOURCE_DIR}/") does not work because cmake seems to strip the trailing slash. Also relax the cmake version requirement from 3.12 to 3.9 as everywhere else in the tree: it works just fine. --- src/libFLAC/ia32/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libFLAC/ia32/CMakeLists.txt b/src/libFLAC/ia32/CMakeLists.txt index 88dc69c8..0236a395 100644 --- a/src/libFLAC/ia32/CMakeLists.txt +++ b/src/libFLAC/ia32/CMakeLists.txt @@ -1,6 +1,7 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.9) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}") +#include_directories("${CMAKE_CURRENT_SOURCE_DIR}") +add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/) if(APPLE) add_compile_options(-dOBJ_FORMAT_macho)