diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-04-02 16:37:07 +0200 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-04-02 17:03:56 +0200 |
| commit | 14b8030d05921ad86b0f5522e81abbcea767a4a8 (patch) | |
| tree | e71c65f25102bbdcda584b86724b61fd820910ee | |
| parent | 71fb3d3a63992c270b1cdac953020eb8848f6b1f (diff) | |
[cmake] extract common CMAKE_INSTALL_LIBDIR to all cmake based internal dep builds
| -rw-r--r-- | cmake/modules/FindFmt.cmake | 1 | ||||
| -rw-r--r-- | cmake/modules/FindGtest.cmake | 3 | ||||
| -rw-r--r-- | cmake/modules/FindSpdlog.cmake | 1 | ||||
| -rw-r--r-- | cmake/scripts/common/ModuleHelpers.cmake | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/cmake/modules/FindFmt.cmake b/cmake/modules/FindFmt.cmake index ce8445c54b..574374393a 100644 --- a/cmake/modules/FindFmt.cmake +++ b/cmake/modules/FindFmt.cmake @@ -38,7 +38,6 @@ if(ENABLE_INTERNAL_FMT) set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} - -DCMAKE_INSTALL_LIBDIR=lib -DFMT_DOC=OFF -DFMT_TEST=OFF -DFMT_INSTALL=ON diff --git a/cmake/modules/FindGtest.cmake b/cmake/modules/FindGtest.cmake index 80d713dd50..3d2ec93aa2 100644 --- a/cmake/modules/FindGtest.cmake +++ b/cmake/modules/FindGtest.cmake @@ -25,8 +25,7 @@ if(ENABLE_INTERNAL_GTEST) set(CMAKE_ARGS -DBUILD_GMOCK=OFF -DINSTALL_GTEST=ON -DBUILD_SHARED_LIBS=OFF - -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> - -DCMAKE_INSTALL_LIBDIR=lib) + -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>) BUILD_DEP_TARGET() else() diff --git a/cmake/modules/FindSpdlog.cmake b/cmake/modules/FindSpdlog.cmake index e6e3e214a9..acb064a0d1 100644 --- a/cmake/modules/FindSpdlog.cmake +++ b/cmake/modules/FindSpdlog.cmake @@ -39,7 +39,6 @@ if(ENABLE_INTERNAL_SPDLOG) set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS} -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} - -DCMAKE_INSTALL_LIBDIR=lib -DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_BUILD_TESTS=OFF -DSPDLOG_BUILD_BENCH=OFF diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake index 0578e6171f..32e9de9a03 100644 --- a/cmake/scripts/common/ModuleHelpers.cmake +++ b/cmake/scripts/common/ModuleHelpers.cmake @@ -130,7 +130,8 @@ macro(BUILD_DEP_TARGET) include(ExternalProject) if(CMAKE_ARGS) - set(CMAKE_ARGS CMAKE_ARGS ${CMAKE_ARGS}) + set(CMAKE_ARGS CMAKE_ARGS ${CMAKE_ARGS} + -DCMAKE_INSTALL_LIBDIR=lib) if(CMAKE_TOOLCHAIN_FILE) list(APPEND CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}") endif() |