Fix build

AntaresSimulatorTeam · Dec 19, 2024 · c429a4c · c429a4c
1 parent 17a40f1
commit c429a4c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -192,6 +192,7 @@ endif()
 find_package(Boost REQUIRED)
 
 find_package(antlr4-runtime REQUIRED)
+find_package(yaml-cpp REQUIRED)
 
 #Sirius solver
 if(POLICY CMP0074)

diff --git a/src/solver/modelParser/CMakeLists.txt b/src/solver/modelParser/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(yaml-cpp REQUIRED)
-
 set(SOURCES
         parser.cpp
         encoders.hxx
@@ -24,4 +22,4 @@ target_link_libraries(modelParser
 
 install(DIRECTORY include/antares
         DESTINATION "include"
-)
+)
diff --git a/src/solver/modeler/parameters/CMakeLists.txt b/src/solver/modeler/parameters/CMakeLists.txt
@@ -2,14 +2,12 @@ add_library(modeler-parameters
   include/antares/solver/modeler/parameters/modelerParameters.h
   include/antares/solver/modeler/parameters/parseModelerParameters.h
   parseModelerParameters.cpp
-  encoder.hxx
-)
+  encoder.hxx)
 
 target_link_libraries(modeler-parameters
-  PRIVATE
-  yaml-cpp)
+        PRIVATE
+        yaml-cpp)
 
 target_include_directories(modeler-parameters
         PUBLIC
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-)
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
diff --git a/src/tests/src/libs/antares/yaml-parser/CMakeLists.txt b/src/tests/src/libs/antares/yaml-parser/CMakeLists.txt
@@ -1,15 +1,12 @@
-
-find_package(yaml-cpp CONFIG REQUIRED)
-Set(SRCS test_yaml_parser.cpp
+set(SRCS test_yaml_parser.cpp
 )
 
 set(execname "yaml-parser-test")
 add_executable(${execname}  ${SRCS})
 target_link_libraries(${execname}
                        PRIVATE
                        yaml-cpp
-		               Boost::unit_test_framework
-                     )
+		       Boost::unit_test_framework)
 
 
 add_test(NAME yaml-parser COMMAND ${execname})

diff --git a/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp b/src/tests/src/solver/modeler/parameters/testParametersParsing.cpp
@@ -31,7 +31,7 @@
 
 BOOST_AUTO_TEST_SUITE(read_modeler_parameters)
 
-BOOST_AUTO_TEST_CASE(simple)
+BOOST_AUTO_TEST_CASE(all_properties_set)
 {
     const auto working_tmp_dir = CREATE_TMP_DIR_BASED_ON_TEST_NAME();
     const auto fileP = working_tmp_dir / "parameters.yaml";