diff options
author | Sven Gothel <[email protected]> | 2019-12-24 08:56:34 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2019-12-24 08:56:34 +0100 |
commit | 866acb84a73e3294876c6cdcee3d4b6b74cf259f (patch) | |
tree | 1baca9cf7f01f2eb60c85fcb15c547125ac69a5b | |
parent | 4df06c6894b39af5bf4681c0acf0c1c080084c80 (diff) |
Fix 'merge v1.20.0' commit 4df06c6894b39af5bf4681c0acf0c1c080084c80v1.20.0
- Remove obsolete OPENAL_CUSTOM_CONFIG
- Add leading-in 'IF(NOT CMAKE_CROSSCOMPILING)', was removed by merge accidentally
-rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f7e1a84..7cdd7e18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,9 +121,6 @@ SET(LIB_VERSION_NUM ${LIB_MAJOR_VERSION},${LIB_MINOR_VERSION},${LIB_REVISION},0) SET(EXPORT_DECL "") -IF(OPENAL_CUSTOM_CONFIG) - include(${OPENAL_CUSTOM_CONFIG}) -ENDIF() CHECK_TYPE_SIZE("long" SIZEOF_LONG) @@ -1073,6 +1070,7 @@ ELSE() "${OpenAL_BINARY_DIR}/version.h") ENDIF() +IF(NOT CMAKE_CROSSCOMPILING) SET(NATIVE_SRC_DIR "${OpenAL_SOURCE_DIR}/native-tools") |