Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/xiph/opus.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Beatrici <git@davidebeatrici.dev>2020-05-28 11:53:18 +0300
committerMark Harris <mark.hsj@gmail.com>2020-06-13 10:21:19 +0300
commitce9d83be806941d48dc37034c0c6522a4bf09bb6 (patch)
tree2c3d735394e863878bdea393462aef85d28fb48e
parent97fca1b3392c4144891b92d2a8c1a27389048873 (diff)
cmake/CFeatureCheck.cmake: fix feature tests failing when Opus is a submodule
CMAKE_SOURCE_DIR corresponds to the top project's source directory. CMAKE_BINARY_DIR corresponds to the top project's binary directory. The usage of these variables doesn't cause any problems when Opus is built as a standalone project. This is not the case when Opus is added as submodule: the variables are set by the project that calls "add_subdirectory()". The fix consists in using PROJECT_SOURCE_DIR and PROJECT_BINARY_DIR, which always refer to the current project. Signed-off-by: Mark Harris <mark.hsj@gmail.com>
-rw-r--r--cmake/CFeatureCheck.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/CFeatureCheck.cmake b/cmake/CFeatureCheck.cmake
index 4059f434..08828f58 100644
--- a/cmake/CFeatureCheck.cmake
+++ b/cmake/CFeatureCheck.cmake
@@ -27,7 +27,7 @@ function(c_feature_check FILE)
if (NOT DEFINED COMPILE_${FEATURE})
message(STATUS "Performing Test ${FEATURE}")
- try_compile(COMPILE_${FEATURE} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/${FILE}.c)
+ try_compile(COMPILE_${FEATURE} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/${FILE}.c)
endif()
if(COMPILE_${FEATURE})
@@ -36,4 +36,4 @@ function(c_feature_check FILE)
else()
message(STATUS "Performing Test ${FEATURE} -- failed to compile")
endif()
-endfunction() \ No newline at end of file
+endfunction()