Skip to content

Add CMake option to enable searching for DynLibs in an extra folder #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hhyyrylainen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add CMake option to enable searching for DynLibs in an extra folder #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ set(SCRIPT_API "None" CACHE STRING "Which scripting API/language to use, if any.
set_property(CACHE SCRIPT_API PROPERTY STRINGS "None" "C#")

set(SCRIPT_BINDING_GENERATION OFF CACHE BOOL "If true, script binding generation will be supported through a specialized build target. Enable this if you plan on modifying the scripting API. Requires the SBGen tool dependency. Only relevant if you have selected a SCRIPT_API other than \"None\".")

set(DYNLIB_EXTRA_SEARCH_DIRECTORY "" CACHE STRING "If non-empty DynLib loading additionally searches the specified directory for libraries")
5 changes: 5 additions & 0 deletions Source/CMake/BsFrameworkConfig.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@
#define BS_VERSION_STRING _MKSTR(BS_VERSION_MAJOR) "." _MKSTR(BS_VERSION_MINOR) "." _MKSTR(BS_VERSION_PATCH) ".0"

#define BS_IS_BANSHEE3D @BS_IS_BANSHEE3D@

#define BS_DYNLIB_EXTRA_ENABLED @BS_DYNLIB_EXTRA_ENABLED@
#if BS_DYNLIB_EXTRA_ENABLED == 1
#define BS_DYNLIB_EXTRA_SEARCH_DIRECTORY "@DYNLIB_EXTRA_SEARCH_DIRECTORY@"
#endif
6 changes: 6 additions & 0 deletions Source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ else()
set(BS_SCRIPTING_ENABLED 0)
endif()

if(NOT DYNLIB_EXTRA_SEARCH_DIRECTORY STREQUAL "")
set(BS_DYNLIB_EXTRA_ENABLED 1)
else()
set(BS_DYNLIB_EXTRA_ENABLED 0)
endif()

## Generate config files
configure_file("${BSF_SOURCE_DIR}/CMake/BsEngineConfig.h.in" "${PROJECT_BINARY_DIR}/Generated/bsfEngine/BsEngineConfig.h")
configure_file("${BSF_SOURCE_DIR}/CMake/BsFrameworkConfig.h.in" "${PROJECT_BINARY_DIR}/Generated/bsfUtility/BsFrameworkConfig.h")
Expand Down
11 changes: 9 additions & 2 deletions Source/Foundation/bsfUtility/Utility/BsDynLib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,15 @@ namespace bs

if (!mHandle)
{
BS_EXCEPT(InternalErrorException,
"Could not load dynamic library " + mName + ". System Error: " + dynlibError());
#if BS_DYNLIB_EXTRA_ENABLED == 1
mHandle = (DYNLIB_HANDLE)DYNLIB_LOAD(Path::combine(Path(BS_DYNLIB_EXTRA_SEARCH_DIRECTORY),
Path(mName)).toString().c_str());
#endif // BS_DYNLIB_EXTRA_ENABLED
if (!mHandle)
{
BS_EXCEPT(InternalErrorException,
"Could not load dynamic library " + mName + ". System Error: " + dynlibError());
}
}
}

Expand Down