Skip to content

Commit 234f516

Browse files
authored
Fetching Standard Install Paths in Code (#176)
--- Signed-off-by: Kartik Nema <kartnema@qti.qualcomm.com>
1 parent 7a1dd0e commit 234f516

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

modula/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
configure_file(
2+
${CMAKE_CURRENT_SOURCE_DIR}/CoreModules/Include/Config.h.in
3+
${CMAKE_CURRENT_BINARY_DIR}/CoreModules/Include/Config.h
4+
@ONLY)
5+
16
file(GLOB SOURCES "Components/*.cpp"
27
"Common/*.cpp"
38
"CoreModules/*.cpp")
@@ -9,6 +14,7 @@ target_include_directories(UrmAuxUtils PRIVATE ${LIBYAML_INCLUDE_DIRS})
914
target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Components/Include)
1015
target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/Common/Include)
1116
target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/CoreModules/Include)
17+
target_include_directories(UrmAuxUtils PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/CoreModules/Include)
1218
install(TARGETS UrmAuxUtils LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
1319

1420
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Common/Include/UrmPlatformAL.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Urm)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
2+
// SPDX-License-Identifier: BSD-3-Clause-Clear
3+
4+
#ifndef URM_GLOB_CONF_H
5+
#define URM_GLOB_CONF_H
6+
7+
#define LIBDIR_PATH "@CMAKE_INSTALL_FULL_LIBDIR@"
8+
9+
#endif

resource-tuner/init/RestuneInit.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
#include <string>
77
#include <thread>
88
#include <memory>
9+
10+
#include "Config.h"
911
#include "ErrCodes.h"
1012
#include "Extensions.h"
1113
#include "AuxRoutines.h"
@@ -46,7 +48,7 @@ static ErrCode loadExtensionsLib() {
4648
}
4749
}
4850

49-
std::string libDirPath = UrmSettings::mExtensionPluginsLibPath;
51+
std::string libDirPath = std::string(LIBDIR_PATH) + "/urm/";
5052
DIR* dir = opendir(libDirPath.c_str());
5153
if(dir == nullptr) {
5254
return RC_SUCCESS; // Return success regardless, since this is an extension.

0 commit comments

Comments
 (0)