diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 704d1007ac..1b9a1a525e 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -446,8 +446,7 @@ set(UNITY_EXCLUDE_FILES qrc_cafCommandFeatures.cpp # Exclude files including opm-common ProjectDataModel/RimVfpTableExtractor.cpp - ProjectDataModel/RimVfpPlot.cpp -) + ProjectDataModel/RimVfpPlot.cpp) if(RESINSIGHT_ENABLE_UNITY_BUILD) foreach(fileToExclude ${UNITY_EXCLUDE_FILES}) diff --git a/ApplicationCode/Commands/CMakeLists.txt b/ApplicationCode/Commands/CMakeLists.txt index 884097a097..9b2a47b5e5 100644 --- a/ApplicationCode/Commands/CMakeLists.txt +++ b/ApplicationCode/Commands/CMakeLists.txt @@ -55,10 +55,10 @@ add_library( ${COMMAND_MOC_SOURCE_FILES}) target_include_directories( - ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/ThirdParty - ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/generated-opm-common - ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common) + ${PROJECT_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/ThirdParty + ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/generated-opm-common + ${CMAKE_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common) # Before cmake 3.12 OBJECT libraries could not use the target_link_libraries # command, So we need to set the POSITION_INDEPENDENT_CODE option manually