Skip to content

Commit d4731ca

Browse files
committed
[R3] Fixes for new CMake/-Wextra
1 parent 86e05d6 commit d4731ca

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ project(Launcher)
44

55
find_package(WPEFramework)
66

7-
set(PLUGIN_NAME Launcher)
8-
set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
7+
set(MODULE_NAME ${NAMESPACE}${PROJECT_NAME})
98

109
find_package(${NAMESPACE}Plugins REQUIRED)
1110

@@ -20,4 +19,4 @@ target_link_libraries(${MODULE_NAME}
2019
string(TOLOWER ${NAMESPACE} STORAGENAME)
2120
install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${STORAGENAME}/plugins)
2221

23-
write_config(${PLUGIN_NAME})
22+
write_config()

Launcher.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ class Launcher : public PluginHost::IPlugin {
307307
{
308308
return (IsOperational() ? 1 : 0);
309309
}
310-
virtual const bool IsOperational() const
310+
virtual bool IsOperational() const
311311
{
312312
return (_observable == false) || (_main.IsActive());
313313
}

0 commit comments

Comments
 (0)