Include JSON files directly in opm-parser, opm-parser has now no dependencies

ApplicationCode/CMakeLists.txt

@@ -330,9 +330,7 @@ set( LINK_LIBRARIES
     ${ERT_LIBRARIES}
     ${ERT_EXTERNAL_LIBRARIES}
     
-    custom-opm-common
     custom-opm-parser
-    custom-opmjson
 
     NRLib
 

CMakeLists.txt

@@ -208,16 +208,7 @@ endif(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
 # Opm
 ################################################################################
 
-add_subdirectory(ThirdParty/custom-opm-common)
 add_subdirectory(ThirdParty/custom-opm-parser)
-add_subdirectory(ThirdParty/custom-opmjson)
-
-set_property(TARGET  
-    custom-opm-common
-    custom-opm-parser
-    custom-opmjson
-	PROPERTY FOLDER "OPM"
-)
 
 
 ################################################################################

ThirdParty/custom-opm-parser/CMakeLists.txt

@@ -290,7 +290,6 @@ Utility/Stringview.hpp)
 
 
 
-
 include_directories(
     opm-parser
     generated-source/include
@@ -320,9 +319,16 @@ generated-source/ParserKeywords2.cpp
 generated-source/ParserKeywords3.cpp
 )
 
+# JSON files included directly, not as a separate lib as in original build configuration 
+set (json_source
+    opm-parser/opm/json/JsonObject.cpp
+    opm-parser/opm/json/cjson/cJSON.c
+)
+
 add_library(${PROJECT_NAME} 
     STATIC
     ${incl_path} 
+    ${json_source}
     ${opm_parser_generated_source_files} 
 )