##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Fix Win build
jeandet -
r1389:80acb196a347
parent child
Show More
Side by Side Unified
Context file:
r1389:80acb196a347 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,1 +1,1
1 Subproject commit 139d5f0a7d64d6d6d1d20862d922cada26ed8df3
1 Subproject commit 5da81c9656ecee14a148854699c97556f22c63aa
Show file before | Show file after | Hide comments
@@ -13,6 +13,8 set(AMDA_SERVER_TYPE "hybrid;amdatest;localhost" CACHE STRING
13
13
14 set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE})
14 set_property(CACHE AMDA_server_type PROPERTY STRINGS ${AMDA_SERVER_TYPE})
15 add_definitions(-DSCIQLOP_AMDA_SERVER="${AMDA_server_type}")
15 add_definitions(-DSCIQLOP_AMDA_SERVER="${AMDA_server_type}")
16 add_definitions(-DAMDAPLUGIN_LIB)
17 add_definitions(-DAMDA_LIB)
16
18
17 add_definitions(-DQT_PLUGIN)
19 add_definitions(-DQT_PLUGIN)
18 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
20 add_definitions(-DSCIQLOP_PLUGIN_JSON_FILE_PATH="${CMAKE_CURRENT_SOURCE_DIR}/resources/amda.json")
Show file before | Show file after | Hide comments
@@ -18,7 +18,8 class GenericWS : public QObject, public IPlugin {
18 Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH)
18 Q_PLUGIN_METADATA(IID "sciqlop.plugin.IPlugin" FILE SCIQLOP_PLUGIN_JSON_FILE_PATH)
19 public:
19 public:
20 /// @sa IPlugin::initialize()
20 /// @sa IPlugin::initialize()
21 void initialize() override;
21 void initialize() override
22 {}
22 };
23 };
23
24
24 #endif // GENERICWSPLUGIN_H
25 #endif // GENERICWSPLUGIN_H
Show file before | Show file after | Hide comments
@@ -24,6 +24,7 install(TARGETS mockplugin
24 include(sciqlop_tests)
24 include(sciqlop_tests)
25
25
26 add_definitions(-DMOCKPLUGIN_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
26 add_definitions(-DMOCKPLUGIN_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
27 add_definitions(-DMOCKPLUGIN_LIB)
27
28
28 #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
29 #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
29 if(PyWrappers)
30 if(PyWrappers)
General Comments 0
You need to be logged in to leave comments. Login now