From 0a7f69286f91592d90a0c2245e828b0ebcf5d29b Mon Sep 17 00:00:00 2001 From: Jade Turner Date: Tue, 2 Jul 2024 15:52:03 +0800 Subject: [PATCH] Fix cmake build with BUILD_MAVEN=ON --- glass/CMakeLists.txt | 20 ++++++++++++++------ simulation/halsim_ds_socket/CMakeLists.txt | 8 ++++++-- simulation/halsim_gui/CMakeLists.txt | 8 ++++++-- simulation/halsim_ws_client/CMakeLists.txt | 8 ++++++-- simulation/halsim_ws_core/CMakeLists.txt | 8 ++++++-- simulation/halsim_ws_server/CMakeLists.txt | 8 ++++++-- simulation/halsim_xrp/CMakeLists.txt | 8 ++++++-- 7 files changed, 50 insertions(+), 18 deletions(-) diff --git a/glass/CMakeLists.txt b/glass/CMakeLists.txt index 1786361b96e..d9691c25092 100644 --- a/glass/CMakeLists.txt +++ b/glass/CMakeLists.txt @@ -25,9 +25,13 @@ target_include_directories( $ ) -install(TARGETS libglass EXPORT libglass) -export(TARGETS libglass FILE libglass.cmake NAMESPACE libglass::) -install(DIRECTORY src/lib/native/include/ DESTINATION "${include_dest}/glass") +if(BUILD_MAVEN) + config_maven_build(libglass) +else() + install(TARGETS libglass EXPORT libglass) + export(TARGETS libglass FILE libglass.cmake NAMESPACE libglass::) + install(DIRECTORY src/lib/native/include/ DESTINATION "${include_dest}/glass") +endif() # # libglassnt @@ -50,9 +54,13 @@ target_include_directories( $ ) -install(TARGETS libglassnt EXPORT libglassnt) -export(TARGETS libglassnt FILE libglassnt.cmake NAMESPACE libglassnt::) -install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass") +if(BUILD_MAVEN) + config_maven_build(libglassnt) +else() + install(TARGETS libglassnt EXPORT libglassnt) + export(TARGETS libglassnt FILE libglassnt.cmake NAMESPACE libglassnt::) + install(DIRECTORY src/libnt/native/include/ DESTINATION "${include_dest}/glass") +endif() # # glass application diff --git a/simulation/halsim_ds_socket/CMakeLists.txt b/simulation/halsim_ds_socket/CMakeLists.txt index c549bd3195e..7d27dc3cee1 100644 --- a/simulation/halsim_ds_socket/CMakeLists.txt +++ b/simulation/halsim_ds_socket/CMakeLists.txt @@ -13,5 +13,9 @@ target_include_directories(halsim_ds_socket PRIVATE src/main/native/include) set_property(TARGET halsim_ds_socket PROPERTY FOLDER "libraries") -install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket) -export(TARGETS halsim_ds_socket FILE halsim_ds_socket.cmake NAMESPACE halsim_ds_socket::) +if(BUILD_MAVEN) + config_maven_build(halsim_ds_socket) +else() + install(TARGETS halsim_ds_socket EXPORT halsim_ds_socket) + export(TARGETS halsim_ds_socket FILE halsim_ds_socket.cmake NAMESPACE halsim_ds_socket::) +endif() diff --git a/simulation/halsim_gui/CMakeLists.txt b/simulation/halsim_gui/CMakeLists.txt index 81d57d200f8..6743013d229 100644 --- a/simulation/halsim_gui/CMakeLists.txt +++ b/simulation/halsim_gui/CMakeLists.txt @@ -16,5 +16,9 @@ target_include_directories(halsim_gui PRIVATE src/main/native/include) set_property(TARGET halsim_gui PROPERTY FOLDER "libraries") -install(TARGETS halsim_gui EXPORT halsim_gui) -export(TARGETS halsim_gui FILE halsim_gui.cmake NAMESPACE halsim_gui::) +if(BUILD_MAVEN) + config_maven_build(halsim_gui) +else() + install(TARGETS halsim_gui EXPORT halsim_gui) + export(TARGETS halsim_gui FILE halsim_gui.cmake NAMESPACE halsim_gui::) +endif() diff --git a/simulation/halsim_ws_client/CMakeLists.txt b/simulation/halsim_ws_client/CMakeLists.txt index 90de8110ea1..15b306a723c 100644 --- a/simulation/halsim_ws_client/CMakeLists.txt +++ b/simulation/halsim_ws_client/CMakeLists.txt @@ -13,5 +13,9 @@ target_include_directories(halsim_ws_client PRIVATE src/main/native/include) set_property(TARGET halsim_ws_client PROPERTY FOLDER "libraries") -install(TARGETS halsim_ws_client EXPORT halsim_ws_client) -export(TARGETS halsim_ws_client FILE halsim_ws_client.cmake NAMESPACE halsim_ws_client::) +if(BUILD_MAVEN) + config_maven_build(halsim_ws_client) +else() + install(TARGETS halsim_ws_client EXPORT halsim_ws_client) + export(TARGETS halsim_ws_client FILE halsim_ws_client.cmake NAMESPACE halsim_ws_client::) +endif() diff --git a/simulation/halsim_ws_core/CMakeLists.txt b/simulation/halsim_ws_core/CMakeLists.txt index 9d0b29996e1..53702617cc6 100644 --- a/simulation/halsim_ws_core/CMakeLists.txt +++ b/simulation/halsim_ws_core/CMakeLists.txt @@ -13,5 +13,9 @@ target_include_directories(halsim_ws_core PUBLIC src/main/native/include) set_property(TARGET halsim_ws_core PROPERTY FOLDER "libraries") -install(TARGETS halsim_ws_core EXPORT halsim_ws_core) -export(TARGETS halsim_ws_core FILE halsim_ws_core.cmake NAMESPACE halsim_ws_core::) +if(BUILD_MAVEN) + config_maven_build(halsim_ws_core) +else() + install(TARGETS halsim_ws_core EXPORT halsim_ws_core) + export(TARGETS halsim_ws_core FILE halsim_ws_core.cmake NAMESPACE halsim_ws_core::) +endif() diff --git a/simulation/halsim_ws_server/CMakeLists.txt b/simulation/halsim_ws_server/CMakeLists.txt index 8c275599d42..4a8ac2dbc19 100644 --- a/simulation/halsim_ws_server/CMakeLists.txt +++ b/simulation/halsim_ws_server/CMakeLists.txt @@ -13,5 +13,9 @@ target_include_directories(halsim_ws_server PRIVATE src/main/native/include) set_property(TARGET halsim_ws_server PROPERTY FOLDER "libraries") -install(TARGETS halsim_ws_server EXPORT halsim_ws_server) -export(TARGETS halsim_ws_server FILE halsim_ws_server.cmake NAMESPACE halsim_ws_server::) +if(BUILD_MAVEN) + config_maven_build(halsim_ws_server) +else() + install(TARGETS halsim_ws_server EXPORT halsim_ws_server) + export(TARGETS halsim_ws_server FILE halsim_ws_server.cmake NAMESPACE halsim_ws_server::) +endif() diff --git a/simulation/halsim_xrp/CMakeLists.txt b/simulation/halsim_xrp/CMakeLists.txt index f961f3b94d2..924b178ccf0 100644 --- a/simulation/halsim_xrp/CMakeLists.txt +++ b/simulation/halsim_xrp/CMakeLists.txt @@ -13,5 +13,9 @@ target_include_directories(halsim_xrp PRIVATE src/main/native/include) set_property(TARGET halsim_xrp PROPERTY FOLDER "libraries") -install(TARGETS halsim_xrp EXPORT halsim_xrp DESTINATION "${main_lib_dest}") -export(TARGETS halsim_xrp FILE halsim_xrp.cmake NAMESPACE halsim_xrp::) +if(BUILD_MAVEN) + config_maven_build(halsim_xrp) +else() + install(TARGETS halsim_xrp EXPORT halsim_xrp DESTINATION "${main_lib_dest}") + export(TARGETS halsim_xrp FILE halsim_xrp.cmake NAMESPACE halsim_xrp::) +endif()