Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@ install(FILES scripts/cmake/lib_manager.cmake DESTINATION share/lib_manager/cmak
# for deprecated support
configure_file(scripts/cmake/mars-config.cmake.in ${CMAKE_BINARY_DIR}/mars-config.cmake @ONLY)
install(FILES ${CMAKE_BINARY_DIR}/mars-config.cmake DESTINATION share/mars/cmake)

enable_testing()
add_subdirectory(test)
2 changes: 1 addition & 1 deletion src/LibManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ namespace lib_manager {
*/
LibInterface* LibManager::acquireLibrary(const string &libName) {
if(libMap.find(libName) == libMap.end()) {
#ifdef DEBUF
#ifdef DEBUG
fprintf(stderr, "LibManager: could not find \"%s\"\n", libName.c_str());
#endif
return 0;
Expand Down
14 changes: 14 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
include_directories(. ../src)

add_library(abcd SHARED abcd.cpp)
set_target_properties(abcd PROPERTIES
PREFIX lib
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
target_link_libraries(abcd ${PROJECT_NAME})

add_executable(test_suite test.cpp)
target_link_libraries(test_suite ${PROJECT_NAME})

add_test(NAME test COMMAND test_suite)
29 changes: 29 additions & 0 deletions test/abcd.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#include "abcd.hpp"


LibClassA::LibClassA(lib_manager::LibManager* theManager) :
lib_manager::LibInterface(theManager), libName("abcd"),
libVersion(0)
{
}

LibClassA::~LibClassA()
{
}

int LibClassA::getLibVersion() const
{
return libVersion;
}

const std::string LibClassA::getLibName() const
{
return libName;
}

void LibClassA::createModuleInfo()
{
}

DESTROY_LIB(LibClassA);
CREATE_LIB(LibClassA);
15 changes: 15 additions & 0 deletions test/abcd.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#include "LibInterface.hpp"


class LibClassA : public lib_manager::LibInterface
{
public:
LibClassA(lib_manager::LibManager* theManager);
virtual ~LibClassA();
virtual int getLibVersion() const;
virtual const std::string getLibName() const;
virtual void createModuleInfo();
protected:
std::string libName;
int libVersion;
};
Loading