summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsezero <sezero@users.sourceforge.net>2019-10-08 14:35:24 +0300
committerErik de Castro Lopo <erikd@mega-nerd.com>2019-10-10 18:32:21 +1100
commit952d511655d57a0b3ddb5d20a67b3056a613c3ec (patch)
treeb8ee86cff9baac8da89c401d8108fd3ad729a83d
parentd4a1b345dd16591ff6f17c67ee519afebe2f9792 (diff)
downloadflac-952d511655d57a0b3ddb5d20a67b3056a613c3ec.tar.gz
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.
-rw-r--r--src/libFLAC/ia32/CMakeLists.txt5
1 files 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)