Add options to handle static and static runtime builds. #299

gautierbureau · 2021-03-19T10:35:58Z

Signed-off-by: Gautier Bureau [email protected]

Please check if the PR fulfills these requirements (please use '[x]' to check the checkboxes, or submit the PR and then click the checkboxes)

The commit message follows our guidelines
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Enables to build only static/shared versions of the library and use static runtime on windows

What is the current behavior? (You can also link to an open issue here)
Static and shared versions are always built

What is the new behavior (if this is a feature change)?
Choose a specific version static/shared or both. Use a static boost library. Use static runtime on windows.

Signed-off-by: Sébastien LAIGRE <[email protected]>

…evel (#242) (#251) Signed-off-by: Sébastien LAIGRE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]>

… higher (#264) Signed-off-by: Sébastien LAIGRE <[email protected]>

* Always use stdcxx::optional instead of direct usage of boost::optional (#221) * Use optional::operator() to check that an optional is set or not (#216) Signed-off-by: Sébastien LAIGRE <[email protected]>

…tions (#220) (#268) Signed-off-by: Sébastien LAIGRE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]>

…#228) (#266) Signed-off-by: Sébastien LAIGRE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

…tions (#281) Signed-off-by: Luma <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]>

* Add Bus::getP() and Bus::getQ() * Add Network::getCountries() * Rename HvdcLine::*NominalVoltage into HvdcLine::*NominalV * Rename getNominalVoltage into getNominalV and setNominalVoltage into setNominalV Signed-off-by: Sébastien LAIGRE <[email protected]>

Signed-off-by: Gautier Bureau <[email protected]>

Signed-off-by: Sébastien LAIGRE <[email protected]>

mathbagu · 2021-03-22T08:25:17Z

CMakeLists.txt

@@ -36,9 +61,28 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STRE
    # set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D_GLIBCXX_DEBUG")
 elseif (MSVC)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244 /wd4250 /wd4251 /wd4267 /wd4275")
+    if (NOT BUILD_SHARED_LIBS AND BUILD_STATIC_LIBS)
+        if (MSVC_STATIC_RUNTIME_LIBRARY)
+            set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")


This variable has been added in cmake v3.15 (https://cmake.org/cmake/help/git-stage/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html). Is there an equivalent for older version?

mathbagu · 2021-03-22T08:31:43Z

CMakeLists.txt

+else ()
+    set(Boost_USE_STATIC_LIBS OFF)
+    set(Boost_USE_STATIC_RUNTIME OFF)
+endif ()


I propose to set Boost_USE_STATIC_RUNTIME according to the value of MSVC_STATIC_RUNTIME_LIBRARY even if BOOST_STATIC_LIBS is not set.

set(Boost_USE_STATIC_LIBS ${BOOST_STATIC_LIBS}) set(Boost_USE_STATIC_RUNTIME ${MSVC_STATIC_RUNTIME_LIBRARY})

mathbagu · 2021-03-22T08:34:27Z

CMakeLists.txt

+option(BUILD_SHARED_LIBS "Enable/disable build of shared libraries." ON)
+option(BUILD_SHARED_EXTENSIONS "Enable/disable build of shared extensions." ON)
+option(BUILD_STATIC_LIBS "Enable/disable build of static libraries." ON)
+option(BUILD_STATIC_EXTENSIONS "Enable/disable build of static extensions." ON)


It's arguable, but I think we should not allow people to mix static and dynamic libraries. I propose to keep only BUILD_SHARED_LIBS and BUILD_STATIC_LIBS. I wonder if we should add an option for each extension library

mathbagu · 2021-03-22T08:35:19Z

CMakeLists.txt

+if (BOOST_STATIC_LIBS AND BUILD_SHARED_LIBS)
+    set(BOOST_STATIC_LIBS OFF)
+    message(WARNING "BOOST_STATIC_LIBS disabled if you want to build shared libraries. Use this option with BUILD_SHARED_LIBS=OFF")
+endif ()


I would raise an error in that case instead of making an arbitrary choice.

mathbagu · 2021-03-22T08:37:19Z

CMakeLists.txt

+
+if (BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
+    message(FATAL_ERROR "BUILD_TESTS is ON but BUILD_SHARED_LIBS is OFF, you should turn ON BUILD_SHARED_LIBS or turn off BUILD_TESTS.")
+endif ()


Maybe we have to do something similar for the examples. Maybe we can find a way to link the examples and the tests to the IIDM library, using a postfix for example (empty or -static).

Signed-off-by: Mathieu BAGUE <[email protected]>

* Make registerExtension public * Add an example to show how to use an XIIDM extension Signed-off-by: Mathieu BAGUE <[email protected]>

Signed-off-by: Gautier Bureau <[email protected]>

gautierbureau · 2021-04-07T13:25:40Z

Following a discussion with @mathbagu this PR will be put on hold indefinitely. Some conclusions on the proposed solution and future work that could be bone:

as it is now the unit tests can now be launched with a static or shared build but with separate cmake build directories. Previously unit tests were only tested against the shared versions of the library.
One issue with the proposed solutions is that the methods ExtensionProviders::loadExtensions and ExtensionProviders::loadLibrary are not tested anymore because the class ExtensionFixture is not used anymore to load extensions but rather the registerExtensionmethod is used.
Following the two previous issues we stated that unit tests should be launched in static and shared versions in the same cmake build and that there should be distinct target to test them to have code compiled in one version of the target and not the other. For exemple for the shared unit tests ExtensionFixture should still be used and for the the static version a new class similar to what it is proposed here should be used to registerExtension.

sonarqubecloud · 2021-04-07T13:44:04Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication

sebalaig and others added 26 commits January 21, 2021 13:05

Add substation in error message (#237)

e621f84

Signed-off-by: Sébastien LAIGRE <[email protected]>

Make sure xml serializer is not null when writing extensions (#239)

3755724

Signed-off-by: Sébastien LAIGRE <[email protected]>

Invalidate cache after an element is removed from NodeBreakerVoltageL…

7ffef53

…evel (#242) (#251) Signed-off-by: Sébastien LAIGRE <[email protected]>

Update current version to 1.4.0 (#252)

1ecaa31

Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4] Add ThreeWindingsTransformer::getLegs()

7ec5fe4

Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4] Aliases by type (#243) (#255)

3a08d4e

Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4] Add Extendable::getExtensionByName (#210) (#259)

f37484e

[IIDM v1.4] Allow overwriting an existing variant (#209) (#263)

9b928fa

Signed-off-by: Sébastien LAIGRE <[email protected]>

Remove unreached cmake code because required cmake version is 3.12 or…

f99900c

… higher (#264) Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4.1] Usage of stdcxx::optional (#267)

538022a

* Always use stdcxx::optional instead of direct usage of boost::optional (#221) * Use optional::operator() to check that an optional is set or not (#216) Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4.1] Removal of parameters on defaulted/deleted special func…

5cafded

…tions (#220) (#268) Signed-off-by: Sébastien LAIGRE <[email protected]>

Call to direct parent's read method from xml parsers (#226) (#269)

8781b72

Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4.1] Rename stdcxx::reference_wrapper into stdcxx::Reference (…

d749cf1

…#228) (#266) Signed-off-by: Sébastien LAIGRE <[email protected]>

Refactor powsybl::iidm::util (#222) (#270)

3ccb3a2

Signed-off-by: Sébastien LAIGRE <[email protected]>

Refactoring XML read/write of a Network API (#273)

2dea989

Signed-off-by: Sébastien LAIGRE <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

Add option to disable unit tests build (#184) (#274)

f10cb4f

Signed-off-by: Sébastien LAIGRE <[email protected]>

Pass unique_ptr as parameters by rvalue to functions (#234) (#275)

1667068

Signed-off-by: Sébastien LAIGRE <[email protected]>

Fix CI (boost not avaible on github actions) (#278)

b0aa032

Signed-off-by: Sébastien LAIGRE <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

[IIDM v1.4] Add SimpleAnonymizer (#71) (#271)

1eeccab

Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4] Add AbstractTerminalTopologyVisitor (#240) (#272)

b7f6932

Signed-off-by: Sébastien LAIGRE <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

fix node/breaker voltage level connect/disconnect for internal connec…

bdc6968

…tions (#281) Signed-off-by: Luma <[email protected]> Signed-off-by: Mathieu BAGUE <[email protected]>

Fix CI: invoke apt-get update before installing boost (#287)

5a7aa5b

Signed-off-by: Sébastien LAIGRE <[email protected]>

[IIDM v1.4] Add ThreadLocalMultipleVariantContext (#183) (#277)

a34a16a

Signed-off-by: Sébastien LAIGRE <[email protected]>

Add four substations node breaker factory (#276) (#286)

fb284d6

Signed-off-by: Sébastien LAIGRE <[email protected]>

Cosmetic: fix methods order (#289)

01f6b3c

Signed-off-by: Sébastien LAIGRE <[email protected]>

gautierbureau force-pushed the static_runtime_msvc branch 3 times, most recently from a7d0604 to 20039c8 Compare March 19, 2021 11:17

gautierbureau force-pushed the static_runtime_msvc branch from 20039c8 to 02592f6 Compare March 19, 2021 13:36

gautierbureau and others added 2 commits March 19, 2021 14:42

Add option to disable tools build.

9df3438

Signed-off-by: Gautier Bureau <[email protected]>

Add Substation::remove() (#283)

c50b0aa

Signed-off-by: Sébastien LAIGRE <[email protected]>

mathbagu force-pushed the static_runtime_msvc branch from 02592f6 to 31918be Compare March 19, 2021 20:56

mathbagu reviewed Mar 22, 2021

View reviewed changes

mathbagu added the PR: waiting-for-info-author label Mar 22, 2021

Mathieu BAGUE and others added 3 commits March 25, 2021 07:11

Link extensions static libraries with iidm-static

a65cddc

Signed-off-by: Mathieu BAGUE <[email protected]>

Make registerExtension public (#303)

d84e4a4

* Make registerExtension public * Add an example to show how to use an XIIDM extension Signed-off-by: Mathieu BAGUE <[email protected]>

Add options to handle static and static runtime builds.

acc3995

Signed-off-by: Gautier Bureau <[email protected]>

gautierbureau force-pushed the static_runtime_msvc branch from 31918be to 7a7da82 Compare April 7, 2021 13:02

Corrections after review of handle of static/shared compilation.

3b81bdc

Signed-off-by: Gautier Bureau <[email protected]>

gautierbureau force-pushed the static_runtime_msvc branch from 7a7da82 to 3b81bdc Compare April 7, 2021 13:12

gautierbureau added PR: do-not-merge and removed PR: waiting-for-info-author labels Apr 7, 2021

gautierbureau marked this pull request as draft April 7, 2021 13:27

gautierbureau requested review from mathbagu and removed request for mathbagu April 7, 2021 13:27

mathbagu changed the base branch from integration/v1.4.0 to integration/v1.5.0 April 12, 2021 10:11

Base automatically changed from integration/v1.5.0 to main January 10, 2022 10:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add options to handle static and static runtime builds. #299

Add options to handle static and static runtime builds. #299

gautierbureau commented Mar 19, 2021 •

edited

Loading

mathbagu Mar 22, 2021

mathbagu Mar 22, 2021

gautierbureau Apr 2, 2021

mathbagu Mar 22, 2021

mathbagu Mar 22, 2021

gautierbureau Apr 2, 2021

mathbagu Mar 22, 2021

gautierbureau commented Apr 7, 2021 •

edited

Loading

sonarqubecloud bot commented Apr 7, 2021

Add options to handle static and static runtime builds. #299

Are you sure you want to change the base?

Add options to handle static and static runtime builds. #299

Conversation

gautierbureau commented Mar 19, 2021 • edited Loading

mathbagu Mar 22, 2021

Choose a reason for hiding this comment

mathbagu Mar 22, 2021

Choose a reason for hiding this comment

gautierbureau Apr 2, 2021

Choose a reason for hiding this comment

mathbagu Mar 22, 2021

Choose a reason for hiding this comment

mathbagu Mar 22, 2021

Choose a reason for hiding this comment

gautierbureau Apr 2, 2021

Choose a reason for hiding this comment

mathbagu Mar 22, 2021

Choose a reason for hiding this comment

gautierbureau commented Apr 7, 2021 • edited Loading

sonarqubecloud bot commented Apr 7, 2021

gautierbureau commented Mar 19, 2021 •

edited

Loading

gautierbureau commented Apr 7, 2021 •

edited

Loading