Integrated opmjson directly in opm-parser, removed dependency to opm-common

ApplicationCode/CMakeLists.txt

@@ -28,7 +28,7 @@ include_directories(
 	${ERT_INCLUDE_DIRS}
 
     ${Boost_INCLUDE_DIRS}
-    ${custom-opm-common_SOURCE_DIR}/opm-common/
+    ${ResInsight_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common/
     ${custom-opm-parser_SOURCE_DIR}/opm-parser/
 
     ${CMAKE_CURRENT_SOURCE_DIR}

ApplicationCode/UnitTests/opm-parser-Test.cpp

@@ -1,6 +1,6 @@
 #include "gtest/gtest.h"
 
-#include "custom-opm-parser/opm-parser/opm/parser/eclipse/Parser/Parser.hpp"
+#include "opm/parser/eclipse/Parser/Parser.hpp"
 
 
 using namespace Opm;