Skip to content

Adjust to new Common folder #381

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
nxtum wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adjust to new Common folder #381

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 BridgeLink/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set(MODULE_NAME ${NAMESPACE}${PROJECT_NAME})
message("Setting up ${PROJECT_NAME}")

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

Expand All @@ -20,6 +21,7 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${NAMESPACE}Definitions::${NAMESPACE}Definitions)

string(TOLOWER ${NAMESPACE} STORAGENAME)
Expand Down
1 change: 1 addition & 0 deletions BridgeLink/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>
#include <definitions/definitions.h>

#undef EXTERNAL
Expand Down
4 changes: 3 additions & 1 deletion DeviceIdentification/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ find_package(BCM_HOST QUIET)
find_package(MFRFWLibs QUIET)

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

add_library(${MODULE_NAME} SHARED
Expand Down Expand Up @@ -122,7 +123,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins)
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common)

target_include_directories(${MODULE_NAME}
PRIVATE
Expand Down
1 change: 1 addition & 0 deletions DeviceIdentification/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
Expand Down
2 changes: 2 additions & 0 deletions DeviceInfo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

Expand All @@ -52,6 +53,7 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${NAMESPACE}Definitions::${NAMESPACE}Definitions)

install(TARGETS ${MODULE_NAME}
Expand Down
1 change: 1 addition & 0 deletions DeviceInfo/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>
#include <definitions/definitions.h>

#undef EXTERNAL
Expand Down
3 changes: 3 additions & 0 deletions DisplayInfo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)
find_package(BCM_HOST QUIET)
Expand All @@ -62,6 +63,7 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${NAMESPACE}Definitions::${NAMESPACE}Definitions)

if (PLUGIN_DISPLAYINFO_BCM_VERSION_MAJOR)
Expand All @@ -78,6 +80,7 @@ if (USE_DEVICESETTINGS)
../helpers)
target_link_libraries(${MODULE_NAME} PRIVATE
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${IARMBUS_LIBRARIES}
${DS_LIBRARIES})
target_sources(${MODULE_NAME}
Expand Down
1 change: 1 addition & 0 deletions DisplayInfo/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include <core/core.h>
#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
2 changes: 2 additions & 0 deletions LocationSync/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)

Expand All @@ -55,6 +56,7 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${NAMESPACE}Definitions::${NAMESPACE}Definitions)

install(TARGETS ${MODULE_NAME}
Expand Down
1 change: 1 addition & 0 deletions LocationSync/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
Expand Down
2 changes: 2 additions & 0 deletions MessageControl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)
find_package(${NAMESPACE}Messaging REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)
Expand All @@ -61,6 +62,7 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${NAMESPACE}Definitions::${NAMESPACE}Definitions
${NAMESPACE}Messaging::${NAMESPACE}Messaging)

Expand Down
1 change: 1 addition & 0 deletions MessageControl/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@

#include <messaging/messaging.h>
#include <plugins/plugins.h>
#include <common/common.h>
#include <definitions/definitions.h>

#include <interfaces/IMessageControl.h>
Expand Down
2 changes: 2 additions & 0 deletions Messenger/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

Expand All @@ -59,6 +60,7 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${NAMESPACE}Definitions::${NAMESPACE}Definitions)

install(TARGETS ${MODULE_NAME}
Expand Down
1 change: 1 addition & 0 deletions Messenger/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>
#include <definitions/definitions.h>

#undef EXTERNAL
Expand Down
2 changes: 2 additions & 0 deletions Monitor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

Expand All @@ -96,6 +97,7 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${NAMESPACE}Definitions::${NAMESPACE}Definitions)

install(TARGETS ${MODULE_NAME}
Expand Down
1 change: 1 addition & 0 deletions Monitor/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>
#include <definitions/definitions.h>

#undef EXTERNAL
Expand Down
4 changes: 3 additions & 1 deletion OpenCDMi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

add_library(${MODULE_NAME} SHARED
Expand All @@ -64,7 +65,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins )
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common )
# Library definition section
install(TARGETS ${MODULE_NAME}
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
Expand Down
1 change: 1 addition & 0 deletions OpenCDMi/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>
#include <definitions/definitions.h>

#undef EXTERNAL
Expand Down
2 changes: 2 additions & 0 deletions Packager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(libprovision QUIET)
find_package(LibOPKG REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)
Expand All @@ -59,6 +60,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
target_link_libraries(${MODULE_NAME} PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
LibOPKG::LibOPKG)

if (libprovision_FOUND)
Expand Down
1 change: 1 addition & 0 deletions Packager/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <messaging/messaging.h>
#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
Expand Down
4 changes: 3 additions & 1 deletion PerformanceMetrics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

add_library(${MODULE_NAME} SHARED
Expand Down Expand Up @@ -70,7 +71,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins)
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common)

install(TARGETS ${MODULE_NAME}
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
Expand Down
1 change: 1 addition & 0 deletions PerformanceMetrics/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
5 changes: 4 additions & 1 deletion PlayerInfo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(${NAMESPACE}Definitions REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

Expand All @@ -54,7 +55,8 @@ target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Definitions::${NAMESPACE}Definitions
${NAMESPACE}Plugins::${NAMESPACE}Plugins)
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common)

find_package(GStreamer REQUIRED)
if (GStreamer_FOUND)
Expand All @@ -72,6 +74,7 @@ if (GStreamer_FOUND)
../helpers)
target_link_libraries(${MODULE_NAME} PRIVATE
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common
${IARMBUS_LIBRARIES}
${DS_LIBRARIES})
target_sources(${MODULE_NAME}
Expand Down
1 change: 1 addition & 0 deletions PlayerInfo/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
4 changes: 3 additions & 1 deletion RustBridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

add_library(${MODULE_NAME} SHARED
Expand All @@ -46,7 +47,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins)
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common)

install(TARGETS ${MODULE_NAME}
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
Expand Down
1 change: 1 addition & 0 deletions RustBridge/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
4 changes: 3 additions & 1 deletion SecurityAgent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

find_library(SECAPI NAMES ${SECAPI_LIB})
Expand All @@ -62,7 +63,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins)
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common)

if (SECAPI)
target_link_libraries(${MODULE_NAME} PRIVATE ${SECAPI_LIB})
Expand Down
1 change: 1 addition & 0 deletions SecurityAgent/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>
#include "Tracing.h"

#undef EXTERNAL
Expand Down
4 changes: 3 additions & 1 deletion WebBridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ if(BUILD_REFERENCE)
endif()

find_package(${NAMESPACE}Plugins REQUIRED)
find_package(${NAMESPACE}Common REQUIRED)
find_package(CompileSettingsDebug CONFIG REQUIRED)

add_library(${MODULE_NAME} SHARED
Expand All @@ -46,7 +47,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
target_link_libraries(${MODULE_NAME}
PRIVATE
CompileSettingsDebug::CompileSettingsDebug
${NAMESPACE}Plugins::${NAMESPACE}Plugins)
${NAMESPACE}Plugins::${NAMESPACE}Plugins
${NAMESPACE}Common::${NAMESPACE}Common)

install(TARGETS ${MODULE_NAME}
DESTINATION ${CMAKE_INSTALL_LIBDIR}/${STORAGE_DIRECTORY}/plugins COMPONENT ${NAMESPACE}_Runtime)
Expand Down
1 change: 1 addition & 0 deletions WebBridge/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#endif

#include <plugins/plugins.h>
#include <common/common.h>

#undef EXTERNAL
#define EXTERNAL
Loading
Loading