diff --git a/modula/CMakeLists.txt b/modula/CMakeLists.txt index a026d4ffc..bf4eb4152 100644 --- a/modula/CMakeLists.txt +++ b/modula/CMakeLists.txt @@ -1,3 +1,8 @@ +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/CoreModules/Include/Config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/CoreModules/Include/Config.h +@ONLY) + file(GLOB SOURCES "Components/*.cpp" "Common/*.cpp" "CoreModules/*.cpp") @@ -9,6 +14,7 @@ target_include_directories(UrmAuxUtils PRIVATE ${LIBYAML_INCLUDE_DIRS}) target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Components/Include) target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Common/Include) target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/CoreModules/Include) +target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/CoreModules/Include) install(TARGETS UrmAuxUtils LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Common/Include/UrmPlatformAL.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Urm) diff --git a/modula/CoreModules/Include/Config.h.in b/modula/CoreModules/Include/Config.h.in new file mode 100644 index 000000000..910903d8a --- /dev/null +++ b/modula/CoreModules/Include/Config.h.in @@ -0,0 +1,9 @@ +// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +// SPDX-License-Identifier: BSD-3-Clause-Clear + +#ifndef URM_GLOB_CONF_H +#define URM_GLOB_CONF_H + +#define LIBDIR_PATH "@CMAKE_INSTALL_FULL_LIBDIR@" + +#endif diff --git a/resource-tuner/init/RestuneInit.cpp b/resource-tuner/init/RestuneInit.cpp index 5fe3661f5..81e2bfe0d 100644 --- a/resource-tuner/init/RestuneInit.cpp +++ b/resource-tuner/init/RestuneInit.cpp @@ -6,6 +6,8 @@ #include #include #include + +#include "Config.h" #include "ErrCodes.h" #include "Extensions.h" #include "AuxRoutines.h" @@ -46,7 +48,7 @@ static ErrCode loadExtensionsLib() { } } - std::string libDirPath = UrmSettings::mExtensionPluginsLibPath; + std::string libDirPath = std::string(LIBDIR_PATH) + "/urm/"; DIR* dir = opendir(libDirPath.c_str()); if(dir == nullptr) { return RC_SUCCESS; // Return success regardless, since this is an extension.