diff --git a/ApplicationCode/Application/CMakeLists_files.cmake b/ApplicationCode/Application/CMakeLists_files.cmake index e8bf0d2989..6e0a95b270 100644 --- a/ApplicationCode/Application/CMakeLists_files.cmake +++ b/ApplicationCode/Application/CMakeLists_files.cmake @@ -1,32 +1,27 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RiaApplication.h -${CEE_CURRENT_LIST_DIR}RiaCompletionTypeCalculationScheduler.h -${CEE_CURRENT_LIST_DIR}RiaDefines.h -${CEE_CURRENT_LIST_DIR}RiaFractureDefines.h -${CEE_CURRENT_LIST_DIR}RiaPreferences.h -${CEE_CURRENT_LIST_DIR}RiaPorosityModel.h -${CEE_CURRENT_LIST_DIR}RiaSummaryCurveDefinition.h -${CEE_CURRENT_LIST_DIR}RiaRftPltCurveDefinition.h -${CEE_CURRENT_LIST_DIR}RiaViewRedrawScheduler.h +${CMAKE_CURRENT_LIST_DIR}/RiaApplication.h +${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.h +${CMAKE_CURRENT_LIST_DIR}/RiaDefines.h +${CMAKE_CURRENT_LIST_DIR}/RiaFractureDefines.h +${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.h +${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.h +${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.h +${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.h +${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RiaApplication.cpp -${CEE_CURRENT_LIST_DIR}RiaCompletionTypeCalculationScheduler.cpp -${CEE_CURRENT_LIST_DIR}RiaDefines.cpp -${CEE_CURRENT_LIST_DIR}RiaFractureDefines.cpp -${CEE_CURRENT_LIST_DIR}RiaMain.cpp -${CEE_CURRENT_LIST_DIR}RiaPreferences.cpp -${CEE_CURRENT_LIST_DIR}RiaPorosityModel.cpp -${CEE_CURRENT_LIST_DIR}RiaSummaryCurveDefinition.cpp -${CEE_CURRENT_LIST_DIR}RiaRftPltCurveDefinition.cpp -${CEE_CURRENT_LIST_DIR}RiaViewRedrawScheduler.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaApplication.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaDefines.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaFractureDefines.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaMain.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.cpp ) list(APPEND CODE_HEADER_FILES @@ -39,10 +34,10 @@ ${SOURCE_GROUP_SOURCE_FILES} set (QT_MOC_HEADERS ${QT_MOC_HEADERS} -${CEE_CURRENT_LIST_DIR}RiaApplication.h -${CEE_CURRENT_LIST_DIR}RiaCompletionTypeCalculationScheduler.h -${CEE_CURRENT_LIST_DIR}RiaViewRedrawScheduler.h +${CMAKE_CURRENT_LIST_DIR}/RiaApplication.h +${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.h +${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.h ) -source_group( "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Application/Tools/CMakeLists_files.cmake b/ApplicationCode/Application/Tools/CMakeLists_files.cmake index 8a38c31b7a..56ab980717 100644 --- a/ApplicationCode/Application/Tools/CMakeLists_files.cmake +++ b/ApplicationCode/Application/Tools/CMakeLists_files.cmake @@ -1,52 +1,46 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RiaArgumentParser.h -${CEE_CURRENT_LIST_DIR}RiaDateStringParser.h -${CEE_CURRENT_LIST_DIR}RiaColorTables.h -${CEE_CURRENT_LIST_DIR}RiaColorTools.h -${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.h -${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.h -${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.h -${CEE_CURRENT_LIST_DIR}RiaLogging.h -${CEE_CURRENT_LIST_DIR}RiaProjectModifier.h -${CEE_CURRENT_LIST_DIR}RiaRegressionTest.h -${CEE_CURRENT_LIST_DIR}RiaImportEclipseCaseTools.h -${CEE_CURRENT_LIST_DIR}RiaQDateTimeTools.h -${CEE_CURRENT_LIST_DIR}RiaSummaryTools.h -${CEE_CURRENT_LIST_DIR}RiaWellNameComparer.h -${CEE_CURRENT_LIST_DIR}RiaStdStringTools.h -${CEE_CURRENT_LIST_DIR}RiaSummaryCurveAnalyzer.h -${CEE_CURRENT_LIST_DIR}RiaSimWellBranchTools.h -${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools.h -${CEE_CURRENT_LIST_DIR}RiaStringEncodingTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaArgumentParser.h +${CMAKE_CURRENT_LIST_DIR}/RiaDateStringParser.h +${CMAKE_CURRENT_LIST_DIR}/RiaColorTables.h +${CMAKE_CURRENT_LIST_DIR}/RiaColorTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaEclipseUnitTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaImageCompareReporter.h +${CMAKE_CURRENT_LIST_DIR}/RiaImageFileCompare.h +${CMAKE_CURRENT_LIST_DIR}/RiaLogging.h +${CMAKE_CURRENT_LIST_DIR}/RiaProjectModifier.h +${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTest.h +${CMAKE_CURRENT_LIST_DIR}/RiaImportEclipseCaseTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaQDateTimeTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaWellNameComparer.h +${CMAKE_CURRENT_LIST_DIR}/RiaStdStringTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveAnalyzer.h +${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileVersionTools.h +${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RiaArgumentParser.cpp -${CEE_CURRENT_LIST_DIR}RiaDateStringParser.cpp -${CEE_CURRENT_LIST_DIR}RiaColorTables.cpp -${CEE_CURRENT_LIST_DIR}RiaColorTools.cpp -${CEE_CURRENT_LIST_DIR}RiaEclipseUnitTools.cpp -${CEE_CURRENT_LIST_DIR}RiaImageCompareReporter.cpp -${CEE_CURRENT_LIST_DIR}RiaImageFileCompare.cpp -${CEE_CURRENT_LIST_DIR}RiaLogging.cpp -${CEE_CURRENT_LIST_DIR}RiaProjectModifier.cpp -${CEE_CURRENT_LIST_DIR}RiaRegressionTest.cpp -${CEE_CURRENT_LIST_DIR}RiaImportEclipseCaseTools.cpp -${CEE_CURRENT_LIST_DIR}RiaQDateTimeTools.cpp -${CEE_CURRENT_LIST_DIR}RiaSummaryTools.cpp -${CEE_CURRENT_LIST_DIR}RiaWellNameComparer.cpp -${CEE_CURRENT_LIST_DIR}RiaStdStringTools.cpp -${CEE_CURRENT_LIST_DIR}RiaSummaryCurveAnalyzer.cpp -${CEE_CURRENT_LIST_DIR}RiaSimWellBranchTools.cpp -${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools.cpp -${CEE_CURRENT_LIST_DIR}RiaStringEncodingTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaArgumentParser.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaDateStringParser.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaColorTables.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaColorTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaEclipseUnitTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaImageCompareReporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaImageFileCompare.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaLogging.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaProjectModifier.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaRegressionTest.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaImportEclipseCaseTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaQDateTimeTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaWellNameComparer.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaStdStringTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveAnalyzer.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileVersionTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.cpp ) list(APPEND CODE_HEADER_FILES @@ -62,4 +56,4 @@ ${QT_MOC_HEADERS} ) -source_group( "Application\\Tools" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "Application\\Tools" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 8c27af7b02..4de30e6ff2 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (ApplicationCode) @@ -15,29 +15,10 @@ if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) endif() include_directories( - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} - ${cafPdmXml_SOURCE_DIR} - ${cafProjectDataModel_SOURCE_DIR} - - ${cafCommand_SOURCE_DIR} - ${cafViewer_SOURCE_DIR} - ${cafAnimControl_SOURCE_DIR} - ${cafUserInterface_SOURCE_DIR} - ${cafPdmCvf_SOURCE_DIR} - ${CommonCode_SOURCE_DIR} - ${cafVizExtensions_SOURCE_DIR} - ${cafTensor_SOURCE_DIR} - - ${ResInsight_SOURCE_DIR}/ThirdParty - ${ResInsight_SOURCE_DIR}/ThirdParty/NRLib/nrlib/well - ${ResInsight_SOURCE_DIR}/ThirdParty/Qwt/src - - ${boost-Subset_SOURCE_DIR} - ${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/ - ${custom-opm-flowdiag-app_SOURCE_DIR}/opm-flowdiagnostics-applications/ - ${custom-opm-flowdiag-app_SOURCE_DIR}/opmCore + # required for compilation of gtest, should be refactored + ${ResInsight_SOURCE_DIR}/ThirdParty + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Adm ${CMAKE_CURRENT_SOURCE_DIR}/Application @@ -170,6 +151,11 @@ list( APPEND CPP_SOURCES add_subdirectory(WellPathImportSsihub) add_subdirectory(ResultStatisticsCache) +set( RI_LIBRARIES + WellPathImportSsihub + ResultStatisticsCache +) + # # Odb api # @@ -182,6 +168,16 @@ if(NOT ${RESINSIGHT_ODB_API_DIR} EQUAL "") endif() add_subdirectory(GeoMech/GeoMechDataModel) +list( APPEND RI_LIBRARIES + RigGeoMechDataModel +) + +if (RESINSIGHT_USE_ODB_API) + list( APPEND RI_LIBRARIES + RifOdbReader + ) +endif() + # # HDF5 @@ -307,10 +303,7 @@ endif () set( LINK_LIBRARIES ${OPM_LIBRARIES} - WellPathImportSsihub - - ResultStatisticsCache - RigGeoMechDataModel + ${RI_LIBRARIES} ${APP_FWK_LIBRARIES} ${VIZ_FWK_LIBRARIES} @@ -328,11 +321,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") ) endif() -# Add the odb reader if we are compiling with odb support -IF (${RESINSIGHT_USE_ODB_API}) - set ( LINK_LIBRARIES ${LINK_LIBRARIES} RifOdbReader) -ENDIF() - target_link_libraries( ResInsight ${LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES}) diff --git a/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake index 453af21c51..443493fdd6 100644 --- a/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/ApplicationCommands/CMakeLists_files.cmake @@ -1,39 +1,34 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicLaunchUnitTestsFeature.h -${CEE_CURRENT_LIST_DIR}RicShowPlotWindowFeature.h -${CEE_CURRENT_LIST_DIR}RicShowMainWindowFeature.h -${CEE_CURRENT_LIST_DIR}RicTileWindowsFeature.h -${CEE_CURRENT_LIST_DIR}RicOpenProjectFeature.h -${CEE_CURRENT_LIST_DIR}RicOpenLastUsedFileFeature.h -${CEE_CURRENT_LIST_DIR}RicSaveProjectFeature.h -${CEE_CURRENT_LIST_DIR}RicSaveProjectAsFeature.h -${CEE_CURRENT_LIST_DIR}RicExitApplicationFeature.h -${CEE_CURRENT_LIST_DIR}RicCloseProjectFeature.h -${CEE_CURRENT_LIST_DIR}RicHelpFeatures.h -${CEE_CURRENT_LIST_DIR}RicEditPreferencesFeature.h -${CEE_CURRENT_LIST_DIR}RicShowPlotDataFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicLaunchUnitTestsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowPlotWindowFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowMainWindowFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicTileWindowsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicOpenProjectFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicOpenLastUsedFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectAsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExitApplicationFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCloseProjectFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicHelpFeatures.h +${CMAKE_CURRENT_LIST_DIR}/RicEditPreferencesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowPlotDataFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicLaunchUnitTestsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowPlotWindowFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowMainWindowFeature.cpp -${CEE_CURRENT_LIST_DIR}RicTileWindowsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicOpenProjectFeature.cpp -${CEE_CURRENT_LIST_DIR}RicOpenLastUsedFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSaveProjectFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSaveProjectAsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExitApplicationFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCloseProjectFeature.cpp -${CEE_CURRENT_LIST_DIR}RicHelpFeatures.cpp -${CEE_CURRENT_LIST_DIR}RicEditPreferencesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowPlotDataFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicLaunchUnitTestsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowPlotWindowFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowMainWindowFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicTileWindowsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicOpenProjectFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicOpenLastUsedFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSaveProjectAsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExitApplicationFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCloseProjectFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicHelpFeatures.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEditPreferencesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowPlotDataFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -49,4 +44,4 @@ ${QT_MOC_HEADERS} ) -source_group( "CommandFeature\\Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index c04f095692..4ca7189620 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -1,138 +1,133 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicWellLogTools.h -${CEE_CURRENT_LIST_DIR}RicCloseCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicCloseSummaryCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicCloseSummaryCaseInCollectionFeature.h -${CEE_CURRENT_LIST_DIR}RicCloseObservedDataFeature.h -${CEE_CURRENT_LIST_DIR}RicCreateSummaryCaseCollectionFeature.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewInViewFeature.h -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.h -${CEE_CURRENT_LIST_DIR}RicNewViewFeature.h -${CEE_CURRENT_LIST_DIR}RicPropertyFilterNewExec.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterExecImpl.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertExec.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertFeature.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.h -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.h -${CEE_CURRENT_LIST_DIR}RicImportFormationNamesFeature.h -${CEE_CURRENT_LIST_DIR}RicReloadFormationNamesFeature.h -${CEE_CURRENT_LIST_DIR}RicReloadWellPathFormationNamesFeature.h -${CEE_CURRENT_LIST_DIR}RicNewSliceRangeFilterFeature.h -${CEE_CURRENT_LIST_DIR}RicHideIntersectionFeature.h -${CEE_CURRENT_LIST_DIR}RicHideIntersectionBoxFeature.h -${CEE_CURRENT_LIST_DIR}RicImportElementPropertyFeature.h -${CEE_CURRENT_LIST_DIR}RicSelectColorResult.h +${CMAKE_CURRENT_LIST_DIR}/RicWellLogTools.h +${CMAKE_CURRENT_LIST_DIR}/RicCloseCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCloseSummaryCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCloseSummaryCaseInCollectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCloseObservedDataFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCreateSummaryCaseCollectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterInsertFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterInsertExec.h +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewInViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewExec.h +${CMAKE_CURRENT_LIST_DIR}/RicNewViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPropertyFilterNewExec.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterExecImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertExec.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewExec.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewSliceIFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewSliceJFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewSliceKFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportFormationNamesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicReloadFormationNamesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicReloadWellPathFormationNamesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSliceRangeFilterFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicHideIntersectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicHideIntersectionBoxFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportElementPropertyFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSelectColorResult.h -${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellLogsImportFileFeature.h -${CEE_CURRENT_LIST_DIR}RicTogglePerspectiveViewFeature.h -${CEE_CURRENT_LIST_DIR}RicImportGeoMechCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicImportSummaryCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicImportSummaryCasesFeature.h -${CEE_CURRENT_LIST_DIR}RicImportObservedDataFeature.h -${CEE_CURRENT_LIST_DIR}RicImportObservedDataInMenuFeature.h -${CEE_CURRENT_LIST_DIR}RicExportFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicTogglePerspectiveViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportGeoMechCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportSummaryCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportSummaryCasesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportObservedDataFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportObservedDataInMenuFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExportFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicSelectOrCreateViewFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicSelectOrCreateViewFeatureImpl.h # General delete of any object in a child array field -${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.h -${CEE_CURRENT_LIST_DIR}RicDeleteItemExecData.h -${CEE_CURRENT_LIST_DIR}RicDeleteItemFeature.h -${CEE_CURRENT_LIST_DIR}RicDeleteSubItemsFeature.h -${CEE_CURRENT_LIST_DIR}RicDeleteSummaryCaseCollectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteItemExec.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteItemExecData.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteItemFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteSubItemsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteSummaryCaseCollectionFeature.h -${CEE_CURRENT_LIST_DIR}RicCloseSourSimDataFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCloseSourSimDataFeature.h -${CEE_CURRENT_LIST_DIR}RicCommandFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCommandFeature.h -${CEE_CURRENT_LIST_DIR}RicReloadCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicReloadSummaryCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicReloadSummaryCasesFeature.h -${CEE_CURRENT_LIST_DIR}RicFlyToObjectFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicReloadCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicReloadSummaryCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicReloadSummaryCasesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicFlyToObjectFeature.h -${CEE_CURRENT_LIST_DIR}RicGridStatisticsDialog.h -${CEE_CURRENT_LIST_DIR}RicShowGridStatisticsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicGridStatisticsDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicShowGridStatisticsFeature.h -${CEE_CURRENT_LIST_DIR}RicFileHierarchyDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicFileHierarchyDialog.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicWellLogTools.cpp -${CEE_CURRENT_LIST_DIR}RicCloseCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCloseSummaryCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCloseSummaryCaseInCollectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCloseObservedDataFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCreateSummaryCaseCollectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertFeature.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterInsertExec.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewInViewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicGeoMechPropertyFilterNewExec.cpp -${CEE_CURRENT_LIST_DIR}RicNewViewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterExecImpl.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertExec.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterInsertFeature.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewExec.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceIFeature.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceJFeature.cpp -${CEE_CURRENT_LIST_DIR}RicRangeFilterNewSliceKFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportFormationNamesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicReloadFormationNamesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicReloadWellPathFormationNamesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewSliceRangeFilterFeature.cpp -${CEE_CURRENT_LIST_DIR}RicHideIntersectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicHideIntersectionBoxFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportElementPropertyFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSelectColorResult.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellLogTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCloseCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCloseSummaryCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCloseSummaryCaseInCollectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCloseObservedDataFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCreateSummaryCaseCollectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterInsertFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterInsertExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewInViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicGeoMechPropertyFilterNewExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterExecImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterInsertFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewSliceIFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewSliceJFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRangeFilterNewSliceKFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportFormationNamesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicReloadFormationNamesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicReloadWellPathFormationNamesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSliceRangeFilterFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicHideIntersectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicHideIntersectionBoxFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportElementPropertyFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSelectColorResult.cpp -${CEE_CURRENT_LIST_DIR}RicTogglePerspectiveViewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportGeoMechCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportSummaryCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportSummaryCasesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportObservedDataFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportObservedDataInMenuFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExportFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicTogglePerspectiveViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportGeoMechCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportSummaryCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportSummaryCasesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportObservedDataFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportObservedDataInMenuFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicSelectOrCreateViewFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSelectOrCreateViewFeatureImpl.cpp # General delete of any object in a child array field -${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteItemExecData.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteItemFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteItemExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteItemExecData.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteItemFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteSubItemsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteSummaryCaseCollectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteSubItemsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteSummaryCaseCollectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCloseSourSimDataFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCloseSourSimDataFeature.cpp -${CEE_CURRENT_LIST_DIR}RicReloadCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicReloadSummaryCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicFlyToObjectFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicReloadCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicReloadSummaryCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicFlyToObjectFeature.cpp -${CEE_CURRENT_LIST_DIR}RicGridStatisticsDialog.cpp -${CEE_CURRENT_LIST_DIR}RicShowGridStatisticsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicGridStatisticsDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowGridStatisticsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicFileHierarchyDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RicFileHierarchyDialog.cpp ) @@ -145,8 +140,8 @@ ${SOURCE_GROUP_SOURCE_FILES} ) list(APPEND QT_MOC_HEADERS -${CEE_CURRENT_LIST_DIR}RicGridStatisticsDialog.h -${CEE_CURRENT_LIST_DIR}RicFileHierarchyDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicGridStatisticsDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicFileHierarchyDialog.h ) -source_group( "CommandFeature" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake index 43d1959445..85a8736fc5 100644 --- a/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake @@ -1,29 +1,24 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicEditPerforationCollectionFeature.h -${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.h -${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.h -${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.h -${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalFeature.h -${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalAtMeasuredDepthFeature.h -${CEE_CURRENT_LIST_DIR}RicWellPathImportCompletionsFileFeature.h -${CEE_CURRENT_LIST_DIR}RicWellPathImportPerforationIntervalsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEditPerforationCollectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExportFishbonesLateralsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewFishbonesSubsAtMeasuredDepthFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewFishbonesSubsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalAtMeasuredDepthFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportCompletionsFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicEditPerforationCollectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewPerforationIntervalAtMeasuredDepthFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathImportCompletionsFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathImportPerforationIntervalsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEditPerforationCollectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportFishbonesLateralsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewFishbonesSubsAtMeasuredDepthFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewFishbonesSubsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewPerforationIntervalAtMeasuredDepthFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportCompletionsFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathImportPerforationIntervalsFeature.cpp ) @@ -35,4 +30,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\Completion" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\Completion" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake index 4e22904d0b..ae0798daf2 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CompletionExportCommands/CMakeLists_files.cmake @@ -1,40 +1,35 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.h -${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.h -${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.h -${CEE_CURRENT_LIST_DIR}RigCompletionData.h -${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.h -${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.h -${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.h -${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.h -${CEE_CURRENT_LIST_DIR}RigEclipseToStimPlanCellTransmissibilityCalculator.h -${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser.h -${CEE_CURRENT_LIST_DIR}RigFractureTransmissibilityEquations.h -${CEE_CURRENT_LIST_DIR}RigWellPathStimplanIntersector.h +${CMAKE_CURRENT_LIST_DIR}/RicExportCompletionDataSettingsUi.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathExportCompletionDataFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathExportCompletionDataFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicFishbonesTransmissibilityCalculationFeatureImp.h +${CMAKE_CURRENT_LIST_DIR}/RigCompletionData.h +${CMAKE_CURRENT_LIST_DIR}/RigCompletionDataGridCell.h +${CMAKE_CURRENT_LIST_DIR}/RicExportFishbonesWellSegmentsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCaseAndFileExportSettingsUi.h +${CMAKE_CURRENT_LIST_DIR}/RicExportFractureCompletionsImpl.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseToStimPlanCellTransmissibilityCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityCondenser.h +${CMAKE_CURRENT_LIST_DIR}/RigFractureTransmissibilityEquations.h +${CMAKE_CURRENT_LIST_DIR}/RigWellPathStimplanIntersector.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicFishbonesTransmissibilityCalculationFeatureImp.cpp -${CEE_CURRENT_LIST_DIR}RigCompletionData.cpp -${CEE_CURRENT_LIST_DIR}RigCompletionDataGridCell.cpp -${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.cpp -${CEE_CURRENT_LIST_DIR}RicExportFractureCompletionsImpl.cpp -${CEE_CURRENT_LIST_DIR}RigEclipseToStimPlanCellTransmissibilityCalculator.cpp -${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser.cpp -${CEE_CURRENT_LIST_DIR}RigFractureTransmissibilityEquations.cpp -${CEE_CURRENT_LIST_DIR}RigWellPathStimplanIntersector.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportCompletionDataSettingsUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathExportCompletionDataFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathExportCompletionDataFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicFishbonesTransmissibilityCalculationFeatureImp.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCompletionData.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCompletionDataGridCell.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportFishbonesWellSegmentsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCaseAndFileExportSettingsUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportFractureCompletionsImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseToStimPlanCellTransmissibilityCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityCondenser.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFractureTransmissibilityEquations.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWellPathStimplanIntersector.cpp ) list(APPEND CODE_HEADER_FILES @@ -45,4 +40,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\CompletionExport" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\CompletionExport" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake index 3ec39b00dc..e13a41b661 100644 --- a/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CrossSectionCommands/CMakeLists_files.cmake @@ -1,25 +1,20 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.h -${CEE_CURRENT_LIST_DIR}RicNewSimWellIntersectionFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.h -${CEE_CURRENT_LIST_DIR}RicNewPolylineIntersectionFeature.h -${CEE_CURRENT_LIST_DIR}RicNewAzimuthDipIntersectionFeature.h -${CEE_CURRENT_LIST_DIR}RicCopyIntersectionsToAllViewsInCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicAppendIntersectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellIntersectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathIntersectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineIntersectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewAzimuthDipIntersectionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicAppendIntersectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewSimWellIntersectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellPathIntersectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewPolylineIntersectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewAzimuthDipIntersectionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCopyIntersectionsToAllViewsInCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAppendIntersectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellIntersectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathIntersectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewPolylineIntersectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewAzimuthDipIntersectionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCopyIntersectionsToAllViewsInCaseFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -30,4 +25,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\CrossSection" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\CrossSection" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake index c3c1cd1e66..1bfbc3825f 100644 --- a/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake @@ -1,51 +1,46 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicAddEclipseInputPropertyFeature.h -${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.h -${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.h -${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFromFilesFeature.h -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.h -${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicImportEclipseCasesFeature.h -${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicApplyPropertyFilterAsCellResultFeature.h -${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseTimeStepFilterFeature.h -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewInViewFeature.h -${CEE_CURRENT_LIST_DIR}RicEclipseHideFaultFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicAddEclipseInputPropertyFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicComputeStatisticsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCaseGroupFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCaseGroupFromFilesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipseCaseNewGroupExec.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipseCaseNewGroupFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterInsertExec.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterInsertFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewExec.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCasesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportInputEclipseCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewStatisticsCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicApplyPropertyFilterAsCellResultFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCaseTimeStepFilterFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewInViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicAddEclipseInputPropertyFeature.cpp -${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFromFilesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportEclipseCasesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicApplyPropertyFilterAsCellResultFeature.cpp -${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseTimeStepFilterFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewInViewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseHideFaultFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAddEclipseInputPropertyFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicComputeStatisticsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCaseGroupFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCaseGroupFromFilesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipseCaseNewGroupExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipseCaseNewGroupFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterInsertExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterInsertFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCasesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportInputEclipseCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewStatisticsCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicApplyPropertyFilterAsCellResultFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicImportEclipseCaseTimeStepFilterFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipsePropertyFilterNewInViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipseHideFaultFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -56,4 +51,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\Eclipse" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\Eclipse" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake b/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake index 27f3295bad..333d21e9ac 100644 --- a/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/EclipseCommands/EclipseWell/CMakeLists_files.cmake @@ -1,17 +1,13 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicEclipseWellFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicEclipseWellShowFeatures.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellShowFeatures.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicEclipseWellFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicEclipseWellShowFeatures.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEclipseWellShowFeatures.cpp ) list(APPEND CODE_HEADER_FILES @@ -22,4 +18,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\Eclipse\\Well" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\Eclipse\\Well" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake index e667c58d71..5fdd3d1c04 100644 --- a/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/ExportCommands/CMakeLists_files.cmake @@ -1,47 +1,42 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicCellRangeUi.h -${CEE_CURRENT_LIST_DIR}RicExportCarfin.h -${CEE_CURRENT_LIST_DIR}RicExportCarfinUi.h -${CEE_CURRENT_LIST_DIR}RicExportFaultsFeature.h -${CEE_CURRENT_LIST_DIR}RicExportMultipleSnapshotsFeature.h -${CEE_CURRENT_LIST_DIR}RicExportToLasFileFeature.h -${CEE_CURRENT_LIST_DIR}RicExportToLasFileResampleUi.h -${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.h -${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputVisibleCellsFeature.h -${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputVisibleCellsUi.h -${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h -${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.h -${CEE_CURRENT_LIST_DIR}RicSnapshotAllPlotsToFileFeature.h -${CEE_CURRENT_LIST_DIR}RicSnapshotAllViewsToFileFeature.h -${CEE_CURRENT_LIST_DIR}RicSnapshotFilenameGenerator.h -${CEE_CURRENT_LIST_DIR}RicSnapshotViewToClipboardFeature.h -${CEE_CURRENT_LIST_DIR}RicSnapshotViewToFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCellRangeUi.h +${CMAKE_CURRENT_LIST_DIR}/RicExportCarfin.h +${CMAKE_CURRENT_LIST_DIR}/RicExportCarfinUi.h +${CMAKE_CURRENT_LIST_DIR}/RicExportFaultsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExportMultipleSnapshotsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExportToLasFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExportToLasFileResampleUi.h +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputPropertyFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsUi.h +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyExec.h +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotAllPlotsToFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotAllViewsToFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotFilenameGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotViewToClipboardFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotViewToFileFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicCellRangeUi.cpp -${CEE_CURRENT_LIST_DIR}RicExportCarfin.cpp -${CEE_CURRENT_LIST_DIR}RicExportCarfinUi.cpp -${CEE_CURRENT_LIST_DIR}RicExportFaultsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExportMultipleSnapshotsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExportToLasFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExportToLasFileResampleUi.cpp -${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputVisibleCellsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputVisibleCellsUi.cpp -${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp -${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSnapshotAllPlotsToFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSnapshotAllViewsToFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSnapshotFilenameGenerator.cpp -${CEE_CURRENT_LIST_DIR}RicSnapshotViewToClipboardFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSnapshotViewToFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCellRangeUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportCarfin.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportCarfinUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportFaultsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportMultipleSnapshotsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportToLasFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExportToLasFileResampleUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputPropertyFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseInputVisibleCellsUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyExec.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSaveEclipseResultAsInputPropertyFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotAllPlotsToFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotAllViewsToFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotFilenameGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotViewToClipboardFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSnapshotViewToFileFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -52,4 +47,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\Export" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\Export" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake index b1f7eeb979..08a748ed6b 100644 --- a/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/FlowCommands/CMakeLists_files.cmake @@ -1,33 +1,28 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicAddStoredFlowCharacteristicsPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicShowWellAllocationPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicShowFlowCharacteristicsPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicAddStoredWellAllocationPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFromPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFeature.h -${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicPlotProductionRateFeature.h -${CEE_CURRENT_LIST_DIR}RicSelectViewUI.h -${CEE_CURRENT_LIST_DIR}RicShowTotalAllocationDataFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicAddStoredFlowCharacteristicsPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowWellAllocationPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowFlowCharacteristicsPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicAddStoredWellAllocationPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowContributingWellsFromPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowContributingWellsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowContributingWellsFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicPlotProductionRateFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSelectViewUI.h +${CMAKE_CURRENT_LIST_DIR}/RicShowTotalAllocationDataFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicAddStoredFlowCharacteristicsPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowWellAllocationPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowFlowCharacteristicsPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicAddStoredWellAllocationPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFromPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowContributingWellsFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicPlotProductionRateFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSelectViewUI.cpp -${CEE_CURRENT_LIST_DIR}RicShowTotalAllocationDataFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAddStoredFlowCharacteristicsPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowWellAllocationPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowFlowCharacteristicsPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAddStoredWellAllocationPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowContributingWellsFromPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowContributingWellsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowContributingWellsFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPlotProductionRateFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSelectViewUI.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowTotalAllocationDataFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -38,4 +33,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\FlowDiagnostics" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\FlowDiagnostics" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake index c5bd8935db..fc0972113c 100644 --- a/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/FractureCommands/CMakeLists_files.cmake @@ -1,37 +1,32 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicPasteEllipseFractureFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteStimPlanFractureFeature.h -${CEE_CURRENT_LIST_DIR}RicConvertAllFractureTemplatesToFieldFeature.h -${CEE_CURRENT_LIST_DIR}RicConvertAllFractureTemplatesToMetricFeature.h -${CEE_CURRENT_LIST_DIR}RicConvertFractureTemplateUnitFeature.h -${CEE_CURRENT_LIST_DIR}RicFractureNameGenerator.h -${CEE_CURRENT_LIST_DIR}RicNewEllipseFractureTemplateFeature.h -${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureAtPosFeature.h -${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureFeature.h -${CEE_CURRENT_LIST_DIR}RicNewStimPlanFractureTemplateFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureAtPosFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteEllipseFractureFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteStimPlanFractureFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicConvertAllFractureTemplatesToFieldFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicConvertAllFractureTemplatesToMetricFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicConvertFractureTemplateUnitFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicFractureNameGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RicNewEllipseFractureTemplateFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellFractureAtPosFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellFractureFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanFractureTemplateFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureAtPosFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicPasteEllipseFractureFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteStimPlanFractureFeature.cpp -${CEE_CURRENT_LIST_DIR}RicConvertAllFractureTemplatesToFieldFeature.cpp -${CEE_CURRENT_LIST_DIR}RicConvertAllFractureTemplatesToMetricFeature.cpp -${CEE_CURRENT_LIST_DIR}RicConvertFractureTemplateUnitFeature.cpp -${CEE_CURRENT_LIST_DIR}RicFractureNameGenerator.cpp -${CEE_CURRENT_LIST_DIR}RicNewEllipseFractureTemplateFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureAtPosFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewSimWellFractureFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewStimPlanFractureTemplateFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureAtPosFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellPathFractureFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteEllipseFractureFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteStimPlanFractureFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicConvertAllFractureTemplatesToFieldFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicConvertAllFractureTemplatesToMetricFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicConvertFractureTemplateUnitFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicFractureNameGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewEllipseFractureTemplateFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellFractureAtPosFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSimWellFractureFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewStimPlanFractureTemplateFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureAtPosFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellPathFractureFeature.cpp ) @@ -43,4 +38,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\Fracture" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\Fracture" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake index 8d4df6e2cb..d6a827a118 100644 --- a/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/IntersectionBoxCommands/CMakeLists_files.cmake @@ -1,25 +1,20 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicBoxManipulatorEventHandler.h -${CEE_CURRENT_LIST_DIR}RicAppendIntersectionBoxFeature.h -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxXSliceFeature.h -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxYSliceFeature.h -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxZSliceFeature.h -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxAtPosFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicBoxManipulatorEventHandler.h +${CMAKE_CURRENT_LIST_DIR}/RicAppendIntersectionBoxFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxXSliceFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxYSliceFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxZSliceFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxAtPosFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicBoxManipulatorEventHandler.cpp -${CEE_CURRENT_LIST_DIR}RicAppendIntersectionBoxFeature.cpp -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxXSliceFeature.cpp -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxYSliceFeature.cpp -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxZSliceFeature.cpp -${CEE_CURRENT_LIST_DIR}RicIntersectionBoxAtPosFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicBoxManipulatorEventHandler.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAppendIntersectionBoxFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxXSliceFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxYSliceFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxZSliceFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionBoxAtPosFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -32,8 +27,8 @@ ${SOURCE_GROUP_SOURCE_FILES} set (QT_MOC_HEADERS ${QT_MOC_HEADERS} -${CEE_CURRENT_LIST_DIR}RicBoxManipulatorEventHandler.h +${CMAKE_CURRENT_LIST_DIR}/RicBoxManipulatorEventHandler.h ) -source_group( "CommandFeature\\IntersectionBox" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\IntersectionBox" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake index 30d4a7728f..9dc9020940 100644 --- a/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/IntersectionViewCommands/CMakeLists_files.cmake @@ -1,15 +1,10 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicNewIntersectionViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewIntersectionViewFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicNewIntersectionViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewIntersectionViewFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -20,4 +15,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\IntersectionView" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\IntersectionView" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake index a2fe983e05..dc59b75adc 100644 --- a/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake @@ -1,34 +1,29 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicAddScriptPathFeature.h -${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.h -${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.h -${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.h -${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h -${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.h -${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicRefreshScriptsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicAddScriptPathFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteScriptPathFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEditScriptFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptForCasesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewScriptFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicScriptFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicRefreshScriptsFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicAddScriptPathFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.cpp -${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.cpp -${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicRefreshScriptsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAddScriptPathFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteScriptPathFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEditScriptFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptForCasesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewScriptFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicScriptFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicRefreshScriptsFeature.cpp ) set (QT_MOC_HEADERS ${QT_MOC_HEADERS} -${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicExecuteScriptForCasesFeature.h ) list(APPEND CODE_HEADER_FILES @@ -39,4 +34,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\Script" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\Script" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake b/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake index ce29835af3..9cd1e67568 100644 --- a/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/OperationsUsingObjReferences/CMakeLists_files.cmake @@ -1,29 +1,24 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicCopyReferencesToClipboardFeature.h -${CEE_CURRENT_LIST_DIR}RicCutReferencesToClipboardFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicCopyReferencesToClipboardFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCutReferencesToClipboardFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicPasteEclipseCasesFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteEclipseViewsFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteGeoMechViewsFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteIntersectionsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseCasesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseViewsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteGeoMechViewsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteIntersectionsFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicCopyReferencesToClipboardFeature.cpp -${CEE_CURRENT_LIST_DIR}RicCutReferencesToClipboardFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCopyReferencesToClipboardFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCutReferencesToClipboardFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicPasteEclipseCasesFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteEclipseViewsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteGeoMechViewsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteIntersectionsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseCasesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteEclipseViewsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteGeoMechViewsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteIntersectionsFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -34,4 +29,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\ObjReferences" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\ObjReferences" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake index 841ee8017a..20ed2af625 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake @@ -1,78 +1,72 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicNewSummaryPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicNewSummaryCrossPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicNewSummaryCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryCrossPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryCrossPlotCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataToSummaryPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataToSummaryPlotFeatureUi.h -${CEE_CURRENT_LIST_DIR}RicViewZoomAllFeature.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveSwitchAxisFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteSummaryPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCrossPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCrossPlotCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCaseFeature.h -${CEE_CURRENT_LIST_DIR}RicAsciiExportSummaryPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicNewGridTimeHistoryCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicSelectSummaryPlotUI.h -${CEE_CURRENT_LIST_DIR}RicPasteTimeHistoryCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicEditSummaryPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicEditSummaryCrossPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreator.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.h -${CEE_CURRENT_LIST_DIR}RicShowSummaryCurveCalculatorFeature.h -${CEE_CURRENT_LIST_DIR}RicEditSummaryCurveCalculationFeature.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.h -${CEE_CURRENT_LIST_DIR}RicNewSummaryCrossPlotCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryCrossPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryCrossPlotCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataToSummaryPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataToSummaryPlotFeatureUi.h +${CMAKE_CURRENT_LIST_DIR}/RicViewZoomAllFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveSwitchAxisFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCrossPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCrossPlotCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCaseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicAsciiExportSummaryPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewGridTimeHistoryCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSelectSummaryPlotUI.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteTimeHistoryCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicNewSummaryPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewSummaryCrossPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewSummaryCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryCrossPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDuplicateSummaryCrossPlotCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataToSummaryPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataToSummaryPlotFeatureUi.cpp -${CEE_CURRENT_LIST_DIR}RicViewZoomAllFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSummaryCurveSwitchAxisFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteSummaryPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCrossPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCrossPlotCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteSummaryCaseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicAsciiExportSummaryPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewGridTimeHistoryCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSelectSummaryPlotUI.cpp -${CEE_CURRENT_LIST_DIR}RicPasteTimeHistoryCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteAsciiDataCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEditSummaryPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEditSummaryCrossPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreator.cpp -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.cpp -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.cpp -${CEE_CURRENT_LIST_DIR}RicShowSummaryCurveCalculatorFeature.cpp -${CEE_CURRENT_LIST_DIR}RicEditSummaryCurveCalculationFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.cpp -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.cpp -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.cpp -${CEE_CURRENT_LIST_DIR}RicNewSummaryCrossPlotCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryCrossPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryCrossPlotCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataToSummaryPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicViewZoomAllFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveSwitchAxisFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCrossPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCrossPlotCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteSummaryCaseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAsciiExportSummaryPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewGridTimeHistoryCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSelectSummaryPlotUI.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteTimeHistoryCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -84,11 +78,10 @@ ${SOURCE_GROUP_SOURCE_FILES} ) list(APPEND QT_MOC_HEADERS -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.h -${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorDialog.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h ) - -source_group( "CommandFeature\\SummaryPlot" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\SummaryPlot" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake index 7827ec4f56..ce811d143d 100644 --- a/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/ToggleCommands/CMakeLists_files.cmake @@ -1,23 +1,18 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicToggleItemsFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicToggleItemsOnFeature.h -${CEE_CURRENT_LIST_DIR}RicToggleItemsOffFeature.h -${CEE_CURRENT_LIST_DIR}RicToggleItemsFeature.h -${CEE_CURRENT_LIST_DIR}RicToggleItemsOnOthersOffFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOnFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOffFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOnOthersOffFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicToggleItemsFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicToggleItemsOnFeature.cpp -${CEE_CURRENT_LIST_DIR}RicToggleItemsOffFeature.cpp -${CEE_CURRENT_LIST_DIR}RicToggleItemsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicToggleItemsOnOthersOffFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOnFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOffFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicToggleItemsOnOthersOffFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -28,4 +23,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\ToggleItems" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\ToggleItems" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake b/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake index 38cdeccec9..f709a38efc 100644 --- a/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/ViewLink/CMakeLists_files.cmake @@ -1,29 +1,24 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.h -${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.h -${CEE_CURRENT_LIST_DIR}RicShowAllLinkedViewsFeature.h -${CEE_CURRENT_LIST_DIR}RicLinkViewFeature.h -${CEE_CURRENT_LIST_DIR}RicUnLinkViewFeature.h -${CEE_CURRENT_LIST_DIR}RicShowLinkOptionsFeature.h -${CEE_CURRENT_LIST_DIR}RicDeleteAllLinkedViewsFeature.h -${CEE_CURRENT_LIST_DIR}RicSetMasterViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicLinkVisibleViewsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicLinkVisibleViewsFeatureUi.h +${CMAKE_CURRENT_LIST_DIR}/RicShowAllLinkedViewsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicLinkViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicUnLinkViewFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicShowLinkOptionsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteAllLinkedViewsFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicSetMasterViewFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicLinkVisibleViewsFeatureUi.cpp -${CEE_CURRENT_LIST_DIR}RicShowAllLinkedViewsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicLinkViewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicUnLinkViewFeature.cpp -${CEE_CURRENT_LIST_DIR}RicShowLinkOptionsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteAllLinkedViewsFeature.cpp -${CEE_CURRENT_LIST_DIR}RicSetMasterViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicLinkVisibleViewsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicLinkVisibleViewsFeatureUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowAllLinkedViewsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicLinkViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicUnLinkViewFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicShowLinkOptionsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteAllLinkedViewsFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSetMasterViewFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -34,4 +29,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\ViewLink" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\ViewLink" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake index 05eb69c4d6..7f31e9a079 100644 --- a/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/WellLogCommands/CMakeLists_files.cmake @@ -1,59 +1,54 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicAddWellLogToPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveExtractionFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellLogRftCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicNewRftPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicDeleteRftPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicNewPltPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicDeletePltPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellLogFileCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.h -${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.h -${CEE_CURRENT_LIST_DIR}RicDeleteWellLogPlotTrackFeature.h -${CEE_CURRENT_LIST_DIR}RicWellLogPlotTrackFeatureImpl.h -${CEE_CURRENT_LIST_DIR}RicPasteWellLogCurveFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteWellLogTrackFeature.h -${CEE_CURRENT_LIST_DIR}RicPasteWellLogPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicChangeDataSourceFeature.h -${CEE_CURRENT_LIST_DIR}RicChangeDataSourceFeatureUi.h -${CEE_CURRENT_LIST_DIR}RicAsciiExportWellLogPlotFeature.h -${CEE_CURRENT_LIST_DIR}RicWellLogFileCloseFeature.h -${CEE_CURRENT_LIST_DIR}RicMoveWellLogFilesFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicAddWellLogToPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogCurveExtractionFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogRftCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewRftPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteRftPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewPltPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeletePltPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogFileCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogPlotFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogPlotTrackFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellLogPlotCurveFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicWellLogsImportFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicDeleteWellLogPlotTrackFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellLogPlotTrackFeatureImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteWellLogCurveFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteWellLogTrackFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicPasteWellLogPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicChangeDataSourceFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicChangeDataSourceFeatureUi.h +${CMAKE_CURRENT_LIST_DIR}/RicAsciiExportWellLogPlotFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellLogFileCloseFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicMoveWellLogFilesFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicAddWellLogToPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellLogCurveExtractionFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellLogRftCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewRftPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteRftPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewPltPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDeletePltPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellLogFileCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicNewWellLogPlotTrackFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellLogPlotCurveFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicWellLogsImportFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicDeleteWellLogPlotTrackFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellLogPlotTrackFeatureImpl.cpp -${CEE_CURRENT_LIST_DIR}RicPasteWellLogCurveFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteWellLogTrackFeature.cpp -${CEE_CURRENT_LIST_DIR}RicPasteWellLogPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicChangeDataSourceFeature.cpp -${CEE_CURRENT_LIST_DIR}RicChangeDataSourceFeatureUi.cpp -${CEE_CURRENT_LIST_DIR}RicAsciiExportWellLogPlotFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellLogFileCloseFeature.cpp -${CEE_CURRENT_LIST_DIR}RicMoveWellLogFilesFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAddWellLogToPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogCurveExtractionFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogRftCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewRftPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteRftPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewPltPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeletePltPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogFileCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogPlotFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicNewWellLogPlotTrackFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellLogPlotCurveFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellLogsImportFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicDeleteWellLogPlotTrackFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellLogPlotTrackFeatureImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteWellLogCurveFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteWellLogTrackFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicPasteWellLogPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicChangeDataSourceFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicChangeDataSourceFeatureUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicAsciiExportWellLogPlotFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellLogFileCloseFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicMoveWellLogFilesFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -64,4 +59,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\WellLog" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\WellLog" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake index d5bbb20c97..67a87c1d8c 100644 --- a/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/WellPathCommands/CMakeLists_files.cmake @@ -1,29 +1,24 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RicWellPathDeleteFeature.h -${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.h -${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.h -${CEE_CURRENT_LIST_DIR}RicWellPathsUnitSystemSettingsImpl.h -${CEE_CURRENT_LIST_DIR}RicWellPathsUnitSystemSettingsUi.h -${CEE_CURRENT_LIST_DIR}RicWellPathViewerEventHandler.h -${CEE_CURRENT_LIST_DIR}RicIntersectionViewerEventHandler.h -${CEE_CURRENT_LIST_DIR}RicWellPathFormationsImportFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathDeleteFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsImportFileFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsImportSsihubFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsImpl.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsUi.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathViewerEventHandler.h +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionViewerEventHandler.h +${CMAKE_CURRENT_LIST_DIR}/RicWellPathFormationsImportFileFeature.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RicWellPathDeleteFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathsUnitSystemSettingsImpl.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathsUnitSystemSettingsUi.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathViewerEventHandler.cpp -${CEE_CURRENT_LIST_DIR}RicIntersectionViewerEventHandler.cpp -${CEE_CURRENT_LIST_DIR}RicWellPathFormationsImportFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathDeleteFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsImportFileFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsImportSsihubFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsImpl.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathsUnitSystemSettingsUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathViewerEventHandler.cpp +${CMAKE_CURRENT_LIST_DIR}/RicIntersectionViewerEventHandler.cpp +${CMAKE_CURRENT_LIST_DIR}/RicWellPathFormationsImportFileFeature.cpp ) list(APPEND CODE_HEADER_FILES @@ -34,4 +29,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "CommandFeature\\WellPath" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "CommandFeature\\WellPath" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/FileInterface/CMakeLists_files.cmake b/ApplicationCode/FileInterface/CMakeLists_files.cmake index 41fd9ff108..a59d71b92e 100644 --- a/ApplicationCode/FileInterface/CMakeLists_files.cmake +++ b/ApplicationCode/FileInterface/CMakeLists_files.cmake @@ -1,93 +1,88 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RifEclipseDataTableFormatter.h -${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools.h -${CEE_CURRENT_LIST_DIR}RifEclipseOutputFileTools.h -${CEE_CURRENT_LIST_DIR}RifEclipseRestartDataAccess.h -${CEE_CURRENT_LIST_DIR}RifEclipseRestartFilesetAccess.h -${CEE_CURRENT_LIST_DIR}RifEclipseSummaryTools.h -${CEE_CURRENT_LIST_DIR}RifEclipseUnifiedRestartFileAccess.h -${CEE_CURRENT_LIST_DIR}RifPerforationIntervalReader.h -${CEE_CURRENT_LIST_DIR}RifReaderEclipseInput.h -${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput.h -${CEE_CURRENT_LIST_DIR}RifSummaryReaderInterface.h -${CEE_CURRENT_LIST_DIR}RifEclipseUserDataParserTools.h -${CEE_CURRENT_LIST_DIR}RifColumnBasedUserDataParser.h -${CEE_CURRENT_LIST_DIR}RifKeywordVectorParser.h -${CEE_CURRENT_LIST_DIR}RifReaderObservedData.h -${CEE_CURRENT_LIST_DIR}RifReaderEclipseSummary.h -${CEE_CURRENT_LIST_DIR}RifReaderEclipseRft.h -${CEE_CURRENT_LIST_DIR}RifJsonEncodeDecode.h -${CEE_CURRENT_LIST_DIR}RifReaderInterface.h -${CEE_CURRENT_LIST_DIR}RifReaderMockModel.h -${CEE_CURRENT_LIST_DIR}RifReaderSettings.h -${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddress.h -${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddressQMetaType.h -${CEE_CURRENT_LIST_DIR}RifEclipseRftAddress.h -${CEE_CURRENT_LIST_DIR}RifWellPathImporter.h -${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.h -${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.h -${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.h -${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPlt.h -${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPltQMetaType.h -${CEE_CURRENT_LIST_DIR}RifEclipseUserDataKeywordTools.h -${CEE_CURRENT_LIST_DIR}RifCsvUserData.h -${CEE_CURRENT_LIST_DIR}RifCsvUserDataParser.h -${CEE_CURRENT_LIST_DIR}RifWellPathFormationReader.h -${CEE_CURRENT_LIST_DIR}RifWellPathFormationsImporter.h -${CEE_CURRENT_LIST_DIR}RifElementPropertyTableReader.h -${CEE_CURRENT_LIST_DIR}RifElementPropertyReader.h -${CEE_CURRENT_LIST_DIR}RifStimPlanXmlReader.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseDataTableFormatter.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputFileTools.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseOutputFileTools.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseRestartDataAccess.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseRestartFilesetAccess.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseSummaryTools.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseUnifiedRestartFileAccess.h +${CMAKE_CURRENT_LIST_DIR}/RifPerforationIntervalReader.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseInput.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseOutput.h +${CMAKE_CURRENT_LIST_DIR}/RifSummaryReaderInterface.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseUserDataParserTools.h +${CMAKE_CURRENT_LIST_DIR}/RifColumnBasedUserDataParser.h +${CMAKE_CURRENT_LIST_DIR}/RifKeywordVectorParser.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderObservedData.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseSummary.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseRft.h +${CMAKE_CURRENT_LIST_DIR}/RifJsonEncodeDecode.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderInterface.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderMockModel.h +${CMAKE_CURRENT_LIST_DIR}/RifReaderSettings.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseSummaryAddress.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseSummaryAddressQMetaType.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseRftAddress.h +${CMAKE_CURRENT_LIST_DIR}/RifWellPathImporter.h +${CMAKE_CURRENT_LIST_DIR}/RifHdf5ReaderInterface.h +${CMAKE_CURRENT_LIST_DIR}/RifColumnBasedUserData.h +${CMAKE_CURRENT_LIST_DIR}/RifKeywordVectorUserData.h +${CMAKE_CURRENT_LIST_DIR}/RifDataSourceForRftPlt.h +${CMAKE_CURRENT_LIST_DIR}/RifDataSourceForRftPltQMetaType.h +${CMAKE_CURRENT_LIST_DIR}/RifEclipseUserDataKeywordTools.h +${CMAKE_CURRENT_LIST_DIR}/RifCsvUserData.h +${CMAKE_CURRENT_LIST_DIR}/RifCsvUserDataParser.h +${CMAKE_CURRENT_LIST_DIR}/RifWellPathFormationReader.h +${CMAKE_CURRENT_LIST_DIR}/RifWellPathFormationsImporter.h +${CMAKE_CURRENT_LIST_DIR}/RifElementPropertyTableReader.h +${CMAKE_CURRENT_LIST_DIR}/RifElementPropertyReader.h +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanXmlReader.h # HDF5 file reader is directly included in ResInsight main CmakeList.txt -#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.h +#${CMAKE_CURRENT_LIST_DIR}/RifHdf5Reader.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RifEclipseDataTableFormatter.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseOutputFileTools.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseRestartDataAccess.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseRestartFilesetAccess.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseUnifiedRestartFileAccess.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseSummaryTools.cpp -${CEE_CURRENT_LIST_DIR}RifPerforationIntervalReader.cpp -${CEE_CURRENT_LIST_DIR}RifReaderEclipseInput.cpp -${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput.cpp -${CEE_CURRENT_LIST_DIR}RifSummaryReaderInterface.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseUserDataParserTools.cpp -${CEE_CURRENT_LIST_DIR}RifColumnBasedUserDataParser.cpp -${CEE_CURRENT_LIST_DIR}RifKeywordVectorParser.cpp -${CEE_CURRENT_LIST_DIR}RifReaderObservedData.cpp -${CEE_CURRENT_LIST_DIR}RifReaderEclipseSummary.cpp -${CEE_CURRENT_LIST_DIR}RifReaderEclipseRft.cpp -${CEE_CURRENT_LIST_DIR}RifJsonEncodeDecode.cpp -${CEE_CURRENT_LIST_DIR}RifReaderInterface.cpp -${CEE_CURRENT_LIST_DIR}RifReaderMockModel.cpp -${CEE_CURRENT_LIST_DIR}RifReaderSettings.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseSummaryAddress.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseRftAddress.cpp -${CEE_CURRENT_LIST_DIR}RifWellPathImporter.cpp -${CEE_CURRENT_LIST_DIR}RifHdf5ReaderInterface.cpp -${CEE_CURRENT_LIST_DIR}RifColumnBasedUserData.cpp -${CEE_CURRENT_LIST_DIR}RifKeywordVectorUserData.cpp -${CEE_CURRENT_LIST_DIR}RifDataSourceForRftPlt.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseUserDataKeywordTools.cpp -${CEE_CURRENT_LIST_DIR}RifCsvUserData.cpp -${CEE_CURRENT_LIST_DIR}RifCsvUserDataParser.cpp -${CEE_CURRENT_LIST_DIR}RifWellPathFormationReader.cpp -${CEE_CURRENT_LIST_DIR}RifWellPathFormationsImporter.cpp -${CEE_CURRENT_LIST_DIR}RifElementPropertyTableReader.cpp -${CEE_CURRENT_LIST_DIR}RifElementPropertyReader.cpp -${CEE_CURRENT_LIST_DIR}RifStimPlanXmlReader.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseDataTableFormatter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputFileTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseOutputFileTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseRestartDataAccess.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseRestartFilesetAccess.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseUnifiedRestartFileAccess.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseSummaryTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RifPerforationIntervalReader.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseInput.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseOutput.cpp +${CMAKE_CURRENT_LIST_DIR}/RifSummaryReaderInterface.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseUserDataParserTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RifColumnBasedUserDataParser.cpp +${CMAKE_CURRENT_LIST_DIR}/RifKeywordVectorParser.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderObservedData.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseSummary.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseRft.cpp +${CMAKE_CURRENT_LIST_DIR}/RifJsonEncodeDecode.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderInterface.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderMockModel.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderSettings.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseSummaryAddress.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseRftAddress.cpp +${CMAKE_CURRENT_LIST_DIR}/RifWellPathImporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifHdf5ReaderInterface.cpp +${CMAKE_CURRENT_LIST_DIR}/RifColumnBasedUserData.cpp +${CMAKE_CURRENT_LIST_DIR}/RifKeywordVectorUserData.cpp +${CMAKE_CURRENT_LIST_DIR}/RifDataSourceForRftPlt.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseUserDataKeywordTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RifCsvUserData.cpp +${CMAKE_CURRENT_LIST_DIR}/RifCsvUserDataParser.cpp +${CMAKE_CURRENT_LIST_DIR}/RifWellPathFormationReader.cpp +${CMAKE_CURRENT_LIST_DIR}/RifWellPathFormationsImporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RifElementPropertyTableReader.cpp +${CMAKE_CURRENT_LIST_DIR}/RifElementPropertyReader.cpp +${CMAKE_CURRENT_LIST_DIR}/RifStimPlanXmlReader.cpp # HDF5 file reader is directly included in ResInsight main CmakeList.txt -#${CEE_CURRENT_LIST_DIR}RifHdf5Reader.cpp +#${CMAKE_CURRENT_LIST_DIR}/RifHdf5Reader.cpp ) list(APPEND CODE_HEADER_FILES @@ -98,4 +93,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "FileInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "FileInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt b/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt index 2201832c4c..ed56edb9f3 100644 --- a/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt +++ b/ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt @@ -1,15 +1,7 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (RigGeoMechDataModel) -include_directories( - ${LibCore_SOURCE_DIR} - ${cafTensor_SOURCE_DIR} - ../../ResultStatisticsCache - ../OdbReader -) - - add_library( ${PROJECT_NAME} RigFemPart.h RigFemPart.cpp @@ -38,4 +30,24 @@ add_library( ${PROJECT_NAME} RimGeoMechGeometrySelectionItem.cpp ) -target_link_libraries( ${PROJECT_NAME} LibCore cafTensor ResultStatisticsCache) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +set( LINK_LIBRARIES + LibCore + + cafPdmCvf + cafTensor + cafUserInterface + CommonCode + + ResultStatisticsCache +) + +target_link_libraries( ${PROJECT_NAME} + ${LINK_LIBRARIES} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake b/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake index adb8e6856c..8db4eb3e1a 100644 --- a/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake +++ b/ApplicationCode/GeoMech/GeoMechVisualization/CMakeLists_files.cmake @@ -1,28 +1,23 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RivFemPartGeometryGenerator.h -${CEE_CURRENT_LIST_DIR}RivFemPartPartMgr.h -${CEE_CURRENT_LIST_DIR}RivGeoMechPartMgr.h -${CEE_CURRENT_LIST_DIR}RivGeoMechPartMgrCache.h -${CEE_CURRENT_LIST_DIR}RivGeoMechVizLogic.h -${CEE_CURRENT_LIST_DIR}RivFemPickSourceInfo.h -${CEE_CURRENT_LIST_DIR}RivFemElmVisibilityCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RivFemPartGeometryGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivFemPartPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivGeoMechPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivGeoMechPartMgrCache.h +${CMAKE_CURRENT_LIST_DIR}/RivGeoMechVizLogic.h +${CMAKE_CURRENT_LIST_DIR}/RivFemPickSourceInfo.h +${CMAKE_CURRENT_LIST_DIR}/RivFemElmVisibilityCalculator.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RivFemPartGeometryGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivFemPartPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivGeoMechPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivGeoMechPartMgrCache.cpp -${CEE_CURRENT_LIST_DIR}RivGeoMechVizLogic.cpp -${CEE_CURRENT_LIST_DIR}RivFemPickSourceInfo.cpp -${CEE_CURRENT_LIST_DIR}RivFemElmVisibilityCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivFemPartGeometryGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivFemPartPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivGeoMechPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivGeoMechPartMgrCache.cpp +${CMAKE_CURRENT_LIST_DIR}/RivGeoMechVizLogic.cpp +${CMAKE_CURRENT_LIST_DIR}/RivFemPickSourceInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RivFemElmVisibilityCalculator.cpp ) @@ -34,4 +29,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "GeoMechViz" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "GeoMechViz" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt b/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt index 75078fa037..57719f104f 100644 --- a/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt +++ b/ApplicationCode/GeoMech/OdbReader/CMakeLists.txt @@ -36,8 +36,6 @@ endif(MSVC) include_directories( ${RESINSIGHT_ODB_API_DIR}/include - ${RigGeoMechDataModel_SOURCE_DIR} - ${LibCore_SOURCE_DIR} ) add_library( ${PROJECT_NAME} @@ -86,4 +84,11 @@ else() ) endif(MSVC) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel LibCore) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/ApplicationCode/ModelVisualization/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/CMakeLists_files.cmake index fa10457974..c2c1d16094 100644 --- a/ApplicationCode/ModelVisualization/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/CMakeLists_files.cmake @@ -1,82 +1,77 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RivCellEdgeEffectGenerator.h -${CEE_CURRENT_LIST_DIR}RivFaultPartMgr.h -${CEE_CURRENT_LIST_DIR}RivFaultGeometryGenerator.h -${CEE_CURRENT_LIST_DIR}RivNNCGeometryGenerator.h -${CEE_CURRENT_LIST_DIR}RivGridPartMgr.h -${CEE_CURRENT_LIST_DIR}RivTernarySaturationOverlayItem.h -${CEE_CURRENT_LIST_DIR}RivReservoirPartMgr.h -${CEE_CURRENT_LIST_DIR}RivReservoirViewPartMgr.h -${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator.h -${CEE_CURRENT_LIST_DIR}RivReservoirFaultsPartMgr.h -${CEE_CURRENT_LIST_DIR}RivReservoirSimWellsPartMgr.h -${CEE_CURRENT_LIST_DIR}RivSourceInfo.h -${CEE_CURRENT_LIST_DIR}RivWellPathSourceInfo.h -${CEE_CURRENT_LIST_DIR}RivWellPathPartMgr.h -${CEE_CURRENT_LIST_DIR}RivWellPathsPartMgr.h -${CEE_CURRENT_LIST_DIR}RivSimWellPipesPartMgr.h -${CEE_CURRENT_LIST_DIR}RivWellHeadPartMgr.h -${CEE_CURRENT_LIST_DIR}RivResultToTextureMapper.h -${CEE_CURRENT_LIST_DIR}RivCompletionTypeResultToTextureMapper.h -${CEE_CURRENT_LIST_DIR}RivDefaultResultToTextureMapper.h -${CEE_CURRENT_LIST_DIR}RivTernaryResultToTextureMapper.h -${CEE_CURRENT_LIST_DIR}RivTextureCoordsCreator.h -${CEE_CURRENT_LIST_DIR}RivTernaryScalarMapper.h -${CEE_CURRENT_LIST_DIR}RivTernaryTextureCoordsCreator.h -${CEE_CURRENT_LIST_DIR}RivTernaryScalarMapperEffectGenerator.h -${CEE_CURRENT_LIST_DIR}RivScalarMapperUtils.h -${CEE_CURRENT_LIST_DIR}RivCellEdgeGeometryUtils.h -${CEE_CURRENT_LIST_DIR}RivPipeQuadToSegmentMapper.h -${CEE_CURRENT_LIST_DIR}RivSingleCellPartGenerator.h -${CEE_CURRENT_LIST_DIR}RivSimWellPipeSourceInfo.h -${CEE_CURRENT_LIST_DIR}RivWellSpheresPartMgr.h -${CEE_CURRENT_LIST_DIR}RivPartPriority.h -${CEE_CURRENT_LIST_DIR}RivObjectSourceInfo.h -${CEE_CURRENT_LIST_DIR}RivWellConnectionsPartMgr.h -${CEE_CURRENT_LIST_DIR}RivFishbonesSubsPartMgr.h -${CEE_CURRENT_LIST_DIR}RivTensorResultPartMgr.h -${CEE_CURRENT_LIST_DIR}RivWellFracturePartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivCellEdgeEffectGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivFaultPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivFaultGeometryGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivNNCGeometryGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivGridPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivTernarySaturationOverlayItem.h +${CMAKE_CURRENT_LIST_DIR}/RivReservoirPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivReservoirViewPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivPipeGeometryGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivReservoirFaultsPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivReservoirSimWellsPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivSourceInfo.h +${CMAKE_CURRENT_LIST_DIR}/RivWellPathSourceInfo.h +${CMAKE_CURRENT_LIST_DIR}/RivWellPathPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivWellPathsPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivSimWellPipesPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivWellHeadPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivResultToTextureMapper.h +${CMAKE_CURRENT_LIST_DIR}/RivCompletionTypeResultToTextureMapper.h +${CMAKE_CURRENT_LIST_DIR}/RivDefaultResultToTextureMapper.h +${CMAKE_CURRENT_LIST_DIR}/RivTernaryResultToTextureMapper.h +${CMAKE_CURRENT_LIST_DIR}/RivTextureCoordsCreator.h +${CMAKE_CURRENT_LIST_DIR}/RivTernaryScalarMapper.h +${CMAKE_CURRENT_LIST_DIR}/RivTernaryTextureCoordsCreator.h +${CMAKE_CURRENT_LIST_DIR}/RivTernaryScalarMapperEffectGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivScalarMapperUtils.h +${CMAKE_CURRENT_LIST_DIR}/RivCellEdgeGeometryUtils.h +${CMAKE_CURRENT_LIST_DIR}/RivPipeQuadToSegmentMapper.h +${CMAKE_CURRENT_LIST_DIR}/RivSingleCellPartGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivSimWellPipeSourceInfo.h +${CMAKE_CURRENT_LIST_DIR}/RivWellSpheresPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivPartPriority.h +${CMAKE_CURRENT_LIST_DIR}/RivObjectSourceInfo.h +${CMAKE_CURRENT_LIST_DIR}/RivWellConnectionsPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivFishbonesSubsPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivTensorResultPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivWellFracturePartMgr.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RivCellEdgeEffectGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivFaultPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivNNCGeometryGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivFaultGeometryGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivGridPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivTernarySaturationOverlayItem.cpp -${CEE_CURRENT_LIST_DIR}RivReservoirFaultsPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivReservoirPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivReservoirViewPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivReservoirSimWellsPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivSourceInfo.cpp -${CEE_CURRENT_LIST_DIR}RivWellPathSourceInfo.cpp -${CEE_CURRENT_LIST_DIR}RivWellPathPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivWellPathsPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivSimWellPipesPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivWellHeadPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivTextureCoordsCreator.cpp -${CEE_CURRENT_LIST_DIR}RivTernaryScalarMapper.cpp -${CEE_CURRENT_LIST_DIR}RivTernaryTextureCoordsCreator.cpp -${CEE_CURRENT_LIST_DIR}RivTernaryScalarMapperEffectGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivScalarMapperUtils.cpp -${CEE_CURRENT_LIST_DIR}RivCellEdgeGeometryUtils.cpp -${CEE_CURRENT_LIST_DIR}RivPipeQuadToSegmentMapper.cpp -${CEE_CURRENT_LIST_DIR}RivSingleCellPartGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivSimWellPipeSourceInfo.cpp -${CEE_CURRENT_LIST_DIR}RivWellSpheresPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivObjectSourceInfo.cpp -${CEE_CURRENT_LIST_DIR}RivWellConnectionsPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivFishbonesSubsPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivTensorResultPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivWellFracturePartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivCellEdgeEffectGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivFaultPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivNNCGeometryGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivFaultGeometryGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivGridPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivTernarySaturationOverlayItem.cpp +${CMAKE_CURRENT_LIST_DIR}/RivReservoirFaultsPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivReservoirPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivReservoirViewPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivPipeGeometryGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivReservoirSimWellsPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivSourceInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWellPathSourceInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWellPathPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWellPathsPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivSimWellPipesPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWellHeadPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivTextureCoordsCreator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivTernaryScalarMapper.cpp +${CMAKE_CURRENT_LIST_DIR}/RivTernaryTextureCoordsCreator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivTernaryScalarMapperEffectGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivScalarMapperUtils.cpp +${CMAKE_CURRENT_LIST_DIR}/RivCellEdgeGeometryUtils.cpp +${CMAKE_CURRENT_LIST_DIR}/RivPipeQuadToSegmentMapper.cpp +${CMAKE_CURRENT_LIST_DIR}/RivSingleCellPartGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivSimWellPipeSourceInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWellSpheresPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivObjectSourceInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWellConnectionsPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivFishbonesSubsPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivTensorResultPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWellFracturePartMgr.cpp ) list(APPEND CODE_HEADER_FILES @@ -87,4 +82,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ModelVisualization" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ModelVisualization" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ModelVisualization/GridBox/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/GridBox/CMakeLists_files.cmake index 0049fdae70..3406423cc9 100644 --- a/ApplicationCode/ModelVisualization/GridBox/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/GridBox/CMakeLists_files.cmake @@ -1,17 +1,12 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RivPatchGenerator.h -${CEE_CURRENT_LIST_DIR}RivGridBoxGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivPatchGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivGridBoxGenerator.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RivPatchGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivGridBoxGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivPatchGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivGridBoxGenerator.cpp ) @@ -23,4 +18,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ModelVisualization\\GridBox" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ModelVisualization\\GridBox" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake index c76e7125bd..5d2e68a6d6 100644 --- a/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/Intersections/CMakeLists_files.cmake @@ -1,27 +1,22 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.h -${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.h -${CEE_CURRENT_LIST_DIR}RivIntersectionSourceInfo.h -${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.h -${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.h -${CEE_CURRENT_LIST_DIR}RivIntersectionBoxPartMgr.h -${CEE_CURRENT_LIST_DIR}RivIntersectionBoxSourceInfo.h +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionGeometryGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionSourceInfo.h +${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.h +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.h +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxPartMgr.h +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RivIntersectionGeometryGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivIntersectionPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivIntersectionSourceInfo.cpp -${CEE_CURRENT_LIST_DIR}RivHexGridIntersectionTools.cpp -${CEE_CURRENT_LIST_DIR}RivIntersectionBoxGeometryGenerator.cpp -${CEE_CURRENT_LIST_DIR}RivIntersectionBoxPartMgr.cpp -${CEE_CURRENT_LIST_DIR}RivIntersectionBoxSourceInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionGeometryGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionSourceInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RivHexGridIntersectionTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxGeometryGenerator.cpp +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxPartMgr.cpp +${CMAKE_CURRENT_LIST_DIR}/RivIntersectionBoxSourceInfo.cpp ) list(APPEND CODE_HEADER_FILES @@ -32,4 +27,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ModelVisualization\\Intersections" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ModelVisualization\\Intersections" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/CMakeLists_files.cmake b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/CMakeLists_files.cmake index 8b861106db..37eb426653 100644 --- a/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/CMakeLists_files.cmake +++ b/ApplicationCode/ModelVisualization/WindowEdgeAxesOverlayItem/CMakeLists_files.cmake @@ -1,15 +1,10 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RivWindowEdgeAxesOverlayItem.h +${CMAKE_CURRENT_LIST_DIR}/RivWindowEdgeAxesOverlayItem.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RivWindowEdgeAxesOverlayItem.cpp +${CMAKE_CURRENT_LIST_DIR}/RivWindowEdgeAxesOverlayItem.cpp ) @@ -21,4 +16,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ModelVisualization\\WindowEdgeAxesOverlayItem" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ModelVisualization\\WindowEdgeAxesOverlayItem" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index 33a2c5e460..ee0a98820c 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -1,208 +1,203 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.h -${CEE_CURRENT_LIST_DIR}RimCaseCollection.h -${CEE_CURRENT_LIST_DIR}RimCellFilter.h -${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.h -${CEE_CURRENT_LIST_DIR}RimPropertyFilterCollection.h -${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilterCollection.h -${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.h -${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.h -${CEE_CURRENT_LIST_DIR}RimLegendConfig.h -${CEE_CURRENT_LIST_DIR}RimOilField.h -${CEE_CURRENT_LIST_DIR}RimProject.h -${CEE_CURRENT_LIST_DIR}RimEclipseCase.h -${CEE_CURRENT_LIST_DIR}RimIdenticalGridCaseGroup.h -${CEE_CURRENT_LIST_DIR}RimEclipseInputProperty.h -${CEE_CURRENT_LIST_DIR}RimEclipseInputPropertyCollection.h -${CEE_CURRENT_LIST_DIR}RimEclipseInputCase.h -${CEE_CURRENT_LIST_DIR}RimEclipseResultCase.h -${CEE_CURRENT_LIST_DIR}RimEclipseView.h -${CEE_CURRENT_LIST_DIR}RimEclipseResultDefinition.h -${CEE_CURRENT_LIST_DIR}RimEclipseCellColors.h -${CEE_CURRENT_LIST_DIR}RimCellEdgeColors.h -${CEE_CURRENT_LIST_DIR}RimSimWellInView.h -${CEE_CURRENT_LIST_DIR}RimSimWellInViewCollection.h -${CEE_CURRENT_LIST_DIR}RimWellPath.h -${CEE_CURRENT_LIST_DIR}RimWellPathCollection.h -${CEE_CURRENT_LIST_DIR}RimScriptCollection.h -${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCase.h -${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseCollection.h -${CEE_CURRENT_LIST_DIR}RimCalcScript.h -${CEE_CURRENT_LIST_DIR}RimExportInputPropertySettings.h -${CEE_CURRENT_LIST_DIR}RimBinaryExportSettings.h -${CEE_CURRENT_LIST_DIR}Rim3dOverlayInfoConfig.h -${CEE_CURRENT_LIST_DIR}RimTensorResults.h -${CEE_CURRENT_LIST_DIR}RimReservoirCellResultsStorage.h -${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseEvaluator.h -${CEE_CURRENT_LIST_DIR}RimMimeData.h -${CEE_CURRENT_LIST_DIR}RimCommandObject.h -${CEE_CURRENT_LIST_DIR}RimTools.h -${CEE_CURRENT_LIST_DIR}RimFaultInView.h -${CEE_CURRENT_LIST_DIR}RimFaultInViewCollection.h -${CEE_CURRENT_LIST_DIR}RimFormationNames.h -${CEE_CURRENT_LIST_DIR}RimFormationNamesCollection.h -${CEE_CURRENT_LIST_DIR}RimMockModelSettings.h -${CEE_CURRENT_LIST_DIR}RimTernaryLegendConfig.h -${CEE_CURRENT_LIST_DIR}RimEclipseFaultColors.h -${CEE_CURRENT_LIST_DIR}RimNoCommonAreaNNC.h -${CEE_CURRENT_LIST_DIR}RimNoCommonAreaNncCollection.h -${CEE_CURRENT_LIST_DIR}RimGeoMechModels.h -${CEE_CURRENT_LIST_DIR}RimGeoMechCase.h -${CEE_CURRENT_LIST_DIR}RimGeoMechView.h -${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilter.h -${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilterCollection.h -${CEE_CURRENT_LIST_DIR}RimGeoMechResultDefinition.h -${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.h -${CEE_CURRENT_LIST_DIR}RimViewWindow.h -${CEE_CURRENT_LIST_DIR}Rim3dView.h -${CEE_CURRENT_LIST_DIR}RimGridView.h -${CEE_CURRENT_LIST_DIR}Rim2dIntersectionView.h -${CEE_CURRENT_LIST_DIR}Rim2dIntersectionViewCollection.h -${CEE_CURRENT_LIST_DIR}RimViewManipulator.h -${CEE_CURRENT_LIST_DIR}RimCase.h -${CEE_CURRENT_LIST_DIR}RimViewController.h -${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.h -${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.h -${CEE_CURRENT_LIST_DIR}RimRftPlotCollection.h -${CEE_CURRENT_LIST_DIR}RimPltPlotCollection.h -${CEE_CURRENT_LIST_DIR}RimWellLogPlot.h -${CEE_CURRENT_LIST_DIR}RimWellLogTrack.h -${CEE_CURRENT_LIST_DIR}RimWellLogCurve.h -${CEE_CURRENT_LIST_DIR}RimViewLinker.h -${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.h -${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.h -${CEE_CURRENT_LIST_DIR}RimWellLogFile.h -${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.h -${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.h -${CEE_CURRENT_LIST_DIR}RimWellLogRftCurve.h -${CEE_CURRENT_LIST_DIR}RimIntersection.h -${CEE_CURRENT_LIST_DIR}RimIntersectionCollection.h -${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.h -${CEE_CURRENT_LIST_DIR}RimGridCollection.h -${CEE_CURRENT_LIST_DIR}RimPlotCurve.h -${CEE_CURRENT_LIST_DIR}RimIntersectionBox.h -${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.h -${CEE_CURRENT_LIST_DIR}RimMdiWindowController.h -${CEE_CURRENT_LIST_DIR}RimPropertyFilter.h -${CEE_CURRENT_LIST_DIR}RimNamedObject.h -${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.h -${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.h -${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.h -${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h -${CEE_CURRENT_LIST_DIR}RimDialogData.h -${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.h -${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.h -${CEE_CURRENT_LIST_DIR}RimSummaryCalculationCollection.h -${CEE_CURRENT_LIST_DIR}RimSummaryCalculationVariable.h -${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.h -${CEE_CURRENT_LIST_DIR}RimStimPlanColors.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimCaseCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimCellFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilterCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilterCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilterCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimLegendConfig.h +${CMAKE_CURRENT_LIST_DIR}/RimOilField.h +${CMAKE_CURRENT_LIST_DIR}/RimProject.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseCase.h +${CMAKE_CURRENT_LIST_DIR}/RimIdenticalGridCaseGroup.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseInputProperty.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseInputPropertyCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseInputCase.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultCase.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseView.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultDefinition.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseCellColors.h +${CMAKE_CURRENT_LIST_DIR}/RimCellEdgeColors.h +${CMAKE_CURRENT_LIST_DIR}/RimSimWellInView.h +${CMAKE_CURRENT_LIST_DIR}/RimSimWellInViewCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimWellPath.h +${CMAKE_CURRENT_LIST_DIR}/RimWellPathCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimScriptCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCase.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimCalcScript.h +${CMAKE_CURRENT_LIST_DIR}/RimExportInputPropertySettings.h +${CMAKE_CURRENT_LIST_DIR}/RimBinaryExportSettings.h +${CMAKE_CURRENT_LIST_DIR}/Rim3dOverlayInfoConfig.h +${CMAKE_CURRENT_LIST_DIR}/RimTensorResults.h +${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseEvaluator.h +${CMAKE_CURRENT_LIST_DIR}/RimMimeData.h +${CMAKE_CURRENT_LIST_DIR}/RimCommandObject.h +${CMAKE_CURRENT_LIST_DIR}/RimTools.h +${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.h +${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimFormationNames.h +${CMAKE_CURRENT_LIST_DIR}/RimFormationNamesCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimMockModelSettings.h +${CMAKE_CURRENT_LIST_DIR}/RimTernaryLegendConfig.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseFaultColors.h +${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNNC.h +${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.h +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.h +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.h +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.h +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.h +${CMAKE_CURRENT_LIST_DIR}/RimViewWindow.h +${CMAKE_CURRENT_LIST_DIR}/Rim3dView.h +${CMAKE_CURRENT_LIST_DIR}/RimGridView.h +${CMAKE_CURRENT_LIST_DIR}/Rim2dIntersectionView.h +${CMAKE_CURRENT_LIST_DIR}/Rim2dIntersectionViewCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimViewManipulator.h +${CMAKE_CURRENT_LIST_DIR}/RimCase.h +${CMAKE_CURRENT_LIST_DIR}/RimViewController.h +${CMAKE_CURRENT_LIST_DIR}/RimMainPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimRftPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimPltPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogTrack.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimViewLinker.h +${CMAKE_CURRENT_LIST_DIR}/RimViewLinkerCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogExtractionCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogFile.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileChannel.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimIntersection.h +${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.h +${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimIntersectionBox.h +${CMAKE_CURRENT_LIST_DIR}/RimMultiSnapshotDefinition.h +${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.h +${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.h +${CMAKE_CURRENT_LIST_DIR}/RimCheckableNamedObject.h +${CMAKE_CURRENT_LIST_DIR}/RimGridTimeHistoryCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimGeometrySelectionItem.h +${CMAKE_CURRENT_LIST_DIR}/RimEclipseGeometrySelectionItem.h +${CMAKE_CURRENT_LIST_DIR}/RimDialogData.h +${CMAKE_CURRENT_LIST_DIR}/RimTimeStepFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculation.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationVariable.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanLegendConfig.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanColors.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.cpp -${CEE_CURRENT_LIST_DIR}RimCaseCollection.cpp -${CEE_CURRENT_LIST_DIR}RimCellFilter.cpp -${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.cpp -${CEE_CURRENT_LIST_DIR}RimPropertyFilterCollection.cpp -${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilterCollection.cpp -${CEE_CURRENT_LIST_DIR}RimCellRangeFilter.cpp -${CEE_CURRENT_LIST_DIR}RimCellRangeFilterCollection.cpp -${CEE_CURRENT_LIST_DIR}RimLegendConfig.cpp -${CEE_CURRENT_LIST_DIR}RimOilField.cpp -${CEE_CURRENT_LIST_DIR}RimProject.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseCase.cpp -${CEE_CURRENT_LIST_DIR}RimIdenticalGridCaseGroup.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseInputProperty.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseInputPropertyCollection.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseInputCase.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseResultCase.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseView.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseResultDefinition.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseCellColors.cpp -${CEE_CURRENT_LIST_DIR}RimCellEdgeColors.cpp -${CEE_CURRENT_LIST_DIR}RimSimWellInView.cpp -${CEE_CURRENT_LIST_DIR}RimSimWellInViewCollection.cpp -${CEE_CURRENT_LIST_DIR}RimWellPath.cpp -${CEE_CURRENT_LIST_DIR}RimWellPathCollection.cpp -${CEE_CURRENT_LIST_DIR}RimScriptCollection.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCase.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseCollection.cpp -${CEE_CURRENT_LIST_DIR}RimCalcScript.cpp -${CEE_CURRENT_LIST_DIR}RimExportInputPropertySettings.cpp -${CEE_CURRENT_LIST_DIR}RimBinaryExportSettings.cpp -${CEE_CURRENT_LIST_DIR}Rim3dOverlayInfoConfig.cpp -${CEE_CURRENT_LIST_DIR}RimTensorResults.cpp -${CEE_CURRENT_LIST_DIR}RimReservoirCellResultsStorage.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseEvaluator.cpp -${CEE_CURRENT_LIST_DIR}RimMimeData.cpp -${CEE_CURRENT_LIST_DIR}RimCommandObject.cpp -${CEE_CURRENT_LIST_DIR}RimTools.cpp -${CEE_CURRENT_LIST_DIR}RimFaultInView.cpp -${CEE_CURRENT_LIST_DIR}RimFaultInViewCollection.cpp -${CEE_CURRENT_LIST_DIR}RimFormationNames.cpp -${CEE_CURRENT_LIST_DIR}RimFormationNamesCollection.cpp -${CEE_CURRENT_LIST_DIR}RimMockModelSettings.cpp -${CEE_CURRENT_LIST_DIR}RimTernaryLegendConfig.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseFaultColors.cpp -${CEE_CURRENT_LIST_DIR}RimNoCommonAreaNNC.cpp -${CEE_CURRENT_LIST_DIR}RimNoCommonAreaNncCollection.cpp -${CEE_CURRENT_LIST_DIR}RimGeoMechModels.cpp -${CEE_CURRENT_LIST_DIR}RimGeoMechCase.cpp -${CEE_CURRENT_LIST_DIR}RimGeoMechView.cpp -${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilter.cpp -${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilterCollection.cpp -${CEE_CURRENT_LIST_DIR}RimGeoMechResultDefinition.cpp -${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.cpp -${CEE_CURRENT_LIST_DIR}RimViewWindow.cpp -${CEE_CURRENT_LIST_DIR}Rim3dView.cpp -${CEE_CURRENT_LIST_DIR}RimGridView.cpp -${CEE_CURRENT_LIST_DIR}Rim2dIntersectionView.cpp -${CEE_CURRENT_LIST_DIR}Rim2dIntersectionViewCollection.cpp -${CEE_CURRENT_LIST_DIR}RimViewManipulator.cpp -${CEE_CURRENT_LIST_DIR}RimCase.cpp -${CEE_CURRENT_LIST_DIR}RimViewController.cpp -${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.cpp -${CEE_CURRENT_LIST_DIR}RimRftPlotCollection.cpp -${CEE_CURRENT_LIST_DIR}RimPltPlotCollection.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogPlot.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogTrack.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogCurve.cpp -${CEE_CURRENT_LIST_DIR}RimViewLinker.cpp -${CEE_CURRENT_LIST_DIR}RimViewLinkerCollection.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurve.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogFile.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogFileChannel.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogFileCurve.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogRftCurve.cpp -${CEE_CURRENT_LIST_DIR}RimIntersection.cpp -${CEE_CURRENT_LIST_DIR}RimIntersectionCollection.cpp -${CEE_CURRENT_LIST_DIR}RimContextCommandBuilder.cpp -${CEE_CURRENT_LIST_DIR}RimGridCollection.cpp -${CEE_CURRENT_LIST_DIR}RimPlotCurve.cpp -${CEE_CURRENT_LIST_DIR}RimIntersectionBox.cpp -${CEE_CURRENT_LIST_DIR}RimMultiSnapshotDefinition.cpp -${CEE_CURRENT_LIST_DIR}RimMdiWindowController.cpp -${CEE_CURRENT_LIST_DIR}RimPropertyFilter.cpp -${CEE_CURRENT_LIST_DIR}RimNamedObject.cpp -${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.cpp -${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.cpp -${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.cpp -${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp -${CEE_CURRENT_LIST_DIR}RimDialogData.cpp -${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCalculationCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCalculationVariable.cpp -${CEE_CURRENT_LIST_DIR}RimStimPlanLegendConfig.cpp -${CEE_CURRENT_LIST_DIR}RimStimPlanColors.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCaseCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCellFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilterCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipsePropertyFilterCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCellRangeFilterCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimLegendConfig.cpp +${CMAKE_CURRENT_LIST_DIR}/RimOilField.cpp +${CMAKE_CURRENT_LIST_DIR}/RimProject.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimIdenticalGridCaseGroup.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseInputProperty.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseInputPropertyCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseInputCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseView.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultDefinition.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseCellColors.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCellEdgeColors.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSimWellInView.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSimWellInViewCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellPath.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellPathCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimScriptCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCalcScript.cpp +${CMAKE_CURRENT_LIST_DIR}/RimExportInputPropertySettings.cpp +${CMAKE_CURRENT_LIST_DIR}/RimBinaryExportSettings.cpp +${CMAKE_CURRENT_LIST_DIR}/Rim3dOverlayInfoConfig.cpp +${CMAKE_CURRENT_LIST_DIR}/RimTensorResults.cpp +${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseStatisticsCaseEvaluator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimMimeData.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCommandObject.cpp +${CMAKE_CURRENT_LIST_DIR}/RimTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFaultInView.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFaultInViewCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFormationNames.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFormationNamesCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimMockModelSettings.cpp +${CMAKE_CURRENT_LIST_DIR}/RimTernaryLegendConfig.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseFaultColors.cpp +${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNNC.cpp +${CMAKE_CURRENT_LIST_DIR}/RimNoCommonAreaNncCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechModels.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechView.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechPropertyFilterCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechResultDefinition.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeoMechCellColors.cpp +${CMAKE_CURRENT_LIST_DIR}/RimViewWindow.cpp +${CMAKE_CURRENT_LIST_DIR}/Rim3dView.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGridView.cpp +${CMAKE_CURRENT_LIST_DIR}/Rim2dIntersectionView.cpp +${CMAKE_CURRENT_LIST_DIR}/Rim2dIntersectionViewCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimViewManipulator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimViewController.cpp +${CMAKE_CURRENT_LIST_DIR}/RimMainPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimRftPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimPltPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogTrack.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimViewLinker.cpp +${CMAKE_CURRENT_LIST_DIR}/RimViewLinkerCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogExtractionCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogFile.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileChannel.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogFileCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogRftCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimIntersection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimIntersectionCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimContextCommandBuilder.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGridCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimPlotCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimIntersectionBox.cpp +${CMAKE_CURRENT_LIST_DIR}/RimMultiSnapshotDefinition.cpp +${CMAKE_CURRENT_LIST_DIR}/RimMdiWindowController.cpp +${CMAKE_CURRENT_LIST_DIR}/RimPropertyFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimNamedObject.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCheckableNamedObject.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGridTimeHistoryCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGeometrySelectionItem.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEclipseGeometrySelectionItem.cpp +${CMAKE_CURRENT_LIST_DIR}/RimDialogData.cpp +${CMAKE_CURRENT_LIST_DIR}/RimTimeStepFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculation.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCalculationVariable.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanLegendConfig.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanColors.cpp ) list(APPEND CODE_HEADER_FILES @@ -214,4 +209,4 @@ ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ProjectDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ProjectDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake index 1bb1525af6..555a1aced8 100644 --- a/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/Completions/CMakeLists_files.cmake @@ -1,54 +1,49 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RimCompletionCellIntersectionCalc.h -${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.h -${CEE_CURRENT_LIST_DIR}RimFishbonesMultipleSubs.h -${CEE_CURRENT_LIST_DIR}RimFishbonesPipeProperties.h -${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.h -${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.h -${CEE_CURRENT_LIST_DIR}RimPerforationCollection.h -${CEE_CURRENT_LIST_DIR}RimPerforationInterval.h -${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h -${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.h -${CEE_CURRENT_LIST_DIR}RimFracture.h -${CEE_CURRENT_LIST_DIR}RimFractureContainment.h -${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.h -${CEE_CURRENT_LIST_DIR}RimFractureTemplate.h -${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.h -${CEE_CURRENT_LIST_DIR}RimSimWellFracture.h -${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.h -${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.h -${CEE_CURRENT_LIST_DIR}RimWellPathFracture.h -${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimCompletionCellIntersectionCalc.h +${CMAKE_CURRENT_LIST_DIR}/RimFishbonesCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimFishbonesMultipleSubs.h +${CMAKE_CURRENT_LIST_DIR}/RimFishbonesPipeProperties.h +${CMAKE_CURRENT_LIST_DIR}/RimFishboneWellPath.h +${CMAKE_CURRENT_LIST_DIR}/RimFishboneWellPathCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimPerforationCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimPerforationInterval.h +${CMAKE_CURRENT_LIST_DIR}/RimWellPathCompletions.h +${CMAKE_CURRENT_LIST_DIR}/RimEllipseFractureTemplate.h +${CMAKE_CURRENT_LIST_DIR}/RimFracture.h +${CMAKE_CURRENT_LIST_DIR}/RimFractureContainment.h +${CMAKE_CURRENT_LIST_DIR}/RimFractureExportSettings.h +${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplate.h +${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplateCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSimWellFracture.h +${CMAKE_CURRENT_LIST_DIR}/RimSimWellFractureCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanFractureTemplate.h +${CMAKE_CURRENT_LIST_DIR}/RimWellPathFracture.h +${CMAKE_CURRENT_LIST_DIR}/RimWellPathFractureCollection.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RimCompletionCellIntersectionCalc.cpp -${CEE_CURRENT_LIST_DIR}RimFishbonesCollection.cpp -${CEE_CURRENT_LIST_DIR}RimFishbonesMultipleSubs.cpp -${CEE_CURRENT_LIST_DIR}RimFishbonesPipeProperties.cpp -${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.cpp -${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.cpp -${CEE_CURRENT_LIST_DIR}RimPerforationCollection.cpp -${CEE_CURRENT_LIST_DIR}RimPerforationInterval.cpp -${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.cpp -${CEE_CURRENT_LIST_DIR}RimEllipseFractureTemplate.cpp -${CEE_CURRENT_LIST_DIR}RimFracture.cpp -${CEE_CURRENT_LIST_DIR}RimFractureContainment.cpp -${CEE_CURRENT_LIST_DIR}RimFractureExportSettings.cpp -${CEE_CURRENT_LIST_DIR}RimFractureTemplate.cpp -${CEE_CURRENT_LIST_DIR}RimFractureTemplateCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSimWellFracture.cpp -${CEE_CURRENT_LIST_DIR}RimSimWellFractureCollection.cpp -${CEE_CURRENT_LIST_DIR}RimStimPlanFractureTemplate.cpp -${CEE_CURRENT_LIST_DIR}RimWellPathFracture.cpp -${CEE_CURRENT_LIST_DIR}RimWellPathFractureCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCompletionCellIntersectionCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFishbonesCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFishbonesMultipleSubs.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFishbonesPipeProperties.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFishboneWellPath.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFishboneWellPathCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimPerforationCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimPerforationInterval.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellPathCompletions.cpp +${CMAKE_CURRENT_LIST_DIR}/RimEllipseFractureTemplate.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFracture.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFractureContainment.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFractureExportSettings.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplate.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFractureTemplateCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSimWellFracture.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSimWellFractureCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimStimPlanFractureTemplate.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellPathFracture.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellPathFractureCollection.cpp ) list(APPEND CODE_HEADER_FILES @@ -59,4 +54,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ProjectDataModel\\Completions" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ProjectDataModel\\Completions" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ProjectDataModel/Flow/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Flow/CMakeLists_files.cmake index 028af8c003..fdbdaa46a8 100644 --- a/ApplicationCode/ProjectDataModel/Flow/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/Flow/CMakeLists_files.cmake @@ -1,37 +1,32 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RimFlowDiagSolution.h -${CEE_CURRENT_LIST_DIR}RimFlowPlotCollection.h -${CEE_CURRENT_LIST_DIR}RimWellAllocationPlot.h -${CEE_CURRENT_LIST_DIR}RimTotalWellAllocationPlot.h -${CEE_CURRENT_LIST_DIR}RimTofAccumulatedPhaseFractionsPlot.h -${CEE_CURRENT_LIST_DIR}RimWellFlowRateCurve.h -${CEE_CURRENT_LIST_DIR}RimWellAllocationPlotLegend.h -${CEE_CURRENT_LIST_DIR}RimFlowCharacteristicsPlot.h -${CEE_CURRENT_LIST_DIR}RimWellRftPlot.h -${CEE_CURRENT_LIST_DIR}RimWellPltPlot.h -${CEE_CURRENT_LIST_DIR}RimDataSourceForRftPlt.h -${CEE_CURRENT_LIST_DIR}RimWellPlotTools.h +${CMAKE_CURRENT_LIST_DIR}/RimFlowDiagSolution.h +${CMAKE_CURRENT_LIST_DIR}/RimFlowPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimWellAllocationPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimTotalWellAllocationPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimTofAccumulatedPhaseFractionsPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimWellFlowRateCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimWellAllocationPlotLegend.h +${CMAKE_CURRENT_LIST_DIR}/RimFlowCharacteristicsPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimWellRftPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimWellPltPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimDataSourceForRftPlt.h +${CMAKE_CURRENT_LIST_DIR}/RimWellPlotTools.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RimFlowDiagSolution.cpp -${CEE_CURRENT_LIST_DIR}RimFlowPlotCollection.cpp -${CEE_CURRENT_LIST_DIR}RimWellAllocationPlot.cpp -${CEE_CURRENT_LIST_DIR}RimTotalWellAllocationPlot.cpp -${CEE_CURRENT_LIST_DIR}RimTofAccumulatedPhaseFractionsPlot.cpp -${CEE_CURRENT_LIST_DIR}RimWellFlowRateCurve.cpp -${CEE_CURRENT_LIST_DIR}RimWellAllocationPlotLegend.cpp -${CEE_CURRENT_LIST_DIR}RimFlowCharacteristicsPlot.cpp -${CEE_CURRENT_LIST_DIR}RimWellRftPlot.cpp -${CEE_CURRENT_LIST_DIR}RimWellPltPlot.cpp -${CEE_CURRENT_LIST_DIR}RimDataSourceForRftPlt.cpp -${CEE_CURRENT_LIST_DIR}RimWellPlotTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFlowDiagSolution.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFlowPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellAllocationPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimTotalWellAllocationPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimTofAccumulatedPhaseFractionsPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellFlowRateCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellAllocationPlotLegend.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFlowCharacteristicsPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellRftPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellPltPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimDataSourceForRftPlt.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellPlotTools.cpp ) list(APPEND CODE_HEADER_FILES @@ -42,4 +37,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ProjectDataModel\\Flow" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ProjectDataModel\\Flow" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake index 6e5f40478d..b4f64b79e0 100644 --- a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake @@ -1,71 +1,66 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RimAsciiDataCurve.h -${CEE_CURRENT_LIST_DIR}RimFileSummaryCase.h -${CEE_CURRENT_LIST_DIR}RimGridSummaryCase.h -${CEE_CURRENT_LIST_DIR}RimSummaryCase.h -${CEE_CURRENT_LIST_DIR}RimSummaryCaseMainCollection.h -${CEE_CURRENT_LIST_DIR}RimSummaryCaseCollection.h -${CEE_CURRENT_LIST_DIR}RimSummaryCurve.h -${CEE_CURRENT_LIST_DIR}RimSummaryCurveAppearanceCalculator.h -${CEE_CURRENT_LIST_DIR}RimSummaryCurveAutoName.h -${CEE_CURRENT_LIST_DIR}RimSummaryCurveFilter.h -${CEE_CURRENT_LIST_DIR}RimSummaryCurvesCalculator.h -${CEE_CURRENT_LIST_DIR}RimSummaryFilter.h -${CEE_CURRENT_LIST_DIR}RimSummaryCurveCollection.h -${CEE_CURRENT_LIST_DIR}RimSummaryPlot.h -${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h -${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlotCollection.h -${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.h -${CEE_CURRENT_LIST_DIR}RimSummaryAxisProperties.h -${CEE_CURRENT_LIST_DIR}RimObservedData.h -${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h -${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h -${CEE_CURRENT_LIST_DIR}RimObservedEclipseUserData.h -${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCase.h -${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCurveReader.h -${CEE_CURRENT_LIST_DIR}RimSummaryAddress.h -${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlot.h -${CEE_CURRENT_LIST_DIR}RimSummaryPlotSourceStepping.h -${CEE_CURRENT_LIST_DIR}RimCsvUserData.h -${CEE_CURRENT_LIST_DIR}RimSummaryPlotNameHelper.h +${CMAKE_CURRENT_LIST_DIR}/RimAsciiDataCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimFileSummaryCase.h +${CMAKE_CURRENT_LIST_DIR}/RimGridSummaryCase.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCase.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseMainCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryFilter.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCrossPlotCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryTimeAxisProperties.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryAxisProperties.h +${CMAKE_CURRENT_LIST_DIR}/RimObservedData.h +${CMAKE_CURRENT_LIST_DIR}/RimObservedDataCollection.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryObservedDataFile.h +${CMAKE_CURRENT_LIST_DIR}/RimObservedEclipseUserData.h +${CMAKE_CURRENT_LIST_DIR}/RimCalculatedSummaryCase.h +${CMAKE_CURRENT_LIST_DIR}/RimCalculatedSummaryCurveReader.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryAddress.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCrossPlot.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotSourceStepping.h +${CMAKE_CURRENT_LIST_DIR}/RimCsvUserData.h +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotNameHelper.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RimAsciiDataCurve.cpp -${CEE_CURRENT_LIST_DIR}RimFileSummaryCase.cpp -${CEE_CURRENT_LIST_DIR}RimGridSummaryCase.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCase.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCaseMainCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCaseCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCurve.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCurveAppearanceCalculator.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCurveAutoName.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCurveFilter.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCurvesCalculator.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryFilter.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCurveCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryPlot.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlotCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryAxisProperties.cpp -${CEE_CURRENT_LIST_DIR}RimObservedData.cpp -${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp -${CEE_CURRENT_LIST_DIR}RimObservedEclipseUserData.cpp -${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCase.cpp -${CEE_CURRENT_LIST_DIR}RimCalculatedSummaryCurveReader.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryAddress.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlot.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryPlotSourceStepping.cpp -${CEE_CURRENT_LIST_DIR}RimCsvUserData.cpp -${CEE_CURRENT_LIST_DIR}RimSummaryPlotNameHelper.cpp +${CMAKE_CURRENT_LIST_DIR}/RimAsciiDataCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimFileSummaryCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimGridSummaryCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseMainCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCaseCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCrossPlotCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryTimeAxisProperties.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryAxisProperties.cpp +${CMAKE_CURRENT_LIST_DIR}/RimObservedData.cpp +${CMAKE_CURRENT_LIST_DIR}/RimObservedDataCollection.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryObservedDataFile.cpp +${CMAKE_CURRENT_LIST_DIR}/RimObservedEclipseUserData.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCalculatedSummaryCase.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCalculatedSummaryCurveReader.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryAddress.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryCrossPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotSourceStepping.cpp +${CMAKE_CURRENT_LIST_DIR}/RimCsvUserData.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotNameHelper.cpp ) list(APPEND CODE_HEADER_FILES @@ -76,4 +71,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ProjectDataModel\\Summary" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ProjectDataModel\\Summary" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake index 5cc7879c20..702bedc7dd 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake @@ -1,135 +1,130 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.h -${CEE_CURRENT_LIST_DIR}RigCell.h -${CEE_CURRENT_LIST_DIR}RigEclipseCaseData.h -${CEE_CURRENT_LIST_DIR}RigGridBase.h -${CEE_CURRENT_LIST_DIR}RigGridManager.h -${CEE_CURRENT_LIST_DIR}RigResultAccessor.h -${CEE_CURRENT_LIST_DIR}RigResultAccessorFactory.h -${CEE_CURRENT_LIST_DIR}RigAllGridCellsResultAccessor.h -${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessor.h -${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.h -${CEE_CURRENT_LIST_DIR}RigCellGeometryTools.h -${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.h -${CEE_CURRENT_LIST_DIR}RigCombMultResultAccessor.h -${CEE_CURRENT_LIST_DIR}RigResultModifier.h -${CEE_CURRENT_LIST_DIR}RigResultModifierFactory.h -${CEE_CURRENT_LIST_DIR}RigFormationNames.h -${CEE_CURRENT_LIST_DIR}RigFlowDiagResultAddress.h -${CEE_CURRENT_LIST_DIR}RigFlowDiagResults.h -${CEE_CURRENT_LIST_DIR}RigFlowDiagResultFrames.h -${CEE_CURRENT_LIST_DIR}RigFlowDiagSolverInterface.h -${CEE_CURRENT_LIST_DIR}RigFlowDiagInterfaceTools.h -${CEE_CURRENT_LIST_DIR}RigFlowDiagStatCalc.h -${CEE_CURRENT_LIST_DIR}RigFlowDiagVisibleCellsStatCalc.h -${CEE_CURRENT_LIST_DIR}RigAccWellFlowCalculator.h -${CEE_CURRENT_LIST_DIR}RigWellLogExtractor.h -${CEE_CURRENT_LIST_DIR}RigEclipseWellLogExtractor.h -${CEE_CURRENT_LIST_DIR}RigLocalGrid.h -${CEE_CURRENT_LIST_DIR}RigMainGrid.h -${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.h -${CEE_CURRENT_LIST_DIR}RigCaseCellResultsData.h -${CEE_CURRENT_LIST_DIR}RigSimWellData.h -${CEE_CURRENT_LIST_DIR}RigWellPath.h -${CEE_CURRENT_LIST_DIR}RigFault.h -${CEE_CURRENT_LIST_DIR}RigNNCData.h -${CEE_CURRENT_LIST_DIR}cvfGeometryTools.h -${CEE_CURRENT_LIST_DIR}cvfGeometryTools.inl -${CEE_CURRENT_LIST_DIR}RigPipeInCellEvaluator.h -${CEE_CURRENT_LIST_DIR}RigTernaryResultAccessor2d.h -${CEE_CURRENT_LIST_DIR}RigEclipseNativeStatCalc.h -${CEE_CURRENT_LIST_DIR}RigEclipseNativeVisibleCellsStatCalc.h -${CEE_CURRENT_LIST_DIR}RigEclipseMultiPropertyStatCalc.h -${CEE_CURRENT_LIST_DIR}RigWellLogCurveData.h -${CEE_CURRENT_LIST_DIR}RigWellLogExtractionTools.h -${CEE_CURRENT_LIST_DIR}RigHexIntersectionTools.h -${CEE_CURRENT_LIST_DIR}RigTimeHistoryResultAccessor.h -${CEE_CURRENT_LIST_DIR}RigCurveDataTools.h -${CEE_CURRENT_LIST_DIR}RigObservedData.h -${CEE_CURRENT_LIST_DIR}RigLasFileExporter.h -${CEE_CURRENT_LIST_DIR}RigSimulationWellCoordsAndMD.h -${CEE_CURRENT_LIST_DIR}RigFishbonesGeometry.h -${CEE_CURRENT_LIST_DIR}RigTesselatorTools.h -${CEE_CURRENT_LIST_DIR}RigCellGeometryTools.h -${CEE_CURRENT_LIST_DIR}RigWellPathIntersectionTools.h -${CEE_CURRENT_LIST_DIR}RigEclipseResultInfo.h -${CEE_CURRENT_LIST_DIR}RigTofAccumulatedPhaseFractionsCalculator.h -${CEE_CURRENT_LIST_DIR}RigTransmissibilityEquations.h -${CEE_CURRENT_LIST_DIR}RigNumberOfFloodedPoreVolumesCalculator.h -${CEE_CURRENT_LIST_DIR}RigWeightedMeanCalc.h -${CEE_CURRENT_LIST_DIR}RigTimeHistoryCurveMerger.h -${CEE_CURRENT_LIST_DIR}RigWellPathFormations.h -${CEE_CURRENT_LIST_DIR}RigStimPlanFractureDefinition.h -${CEE_CURRENT_LIST_DIR}RigFractureGrid.h -${CEE_CURRENT_LIST_DIR}RigFractureCell.h +${CMAKE_CURRENT_LIST_DIR}/RigActiveCellInfo.h +${CMAKE_CURRENT_LIST_DIR}/RigCell.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseData.h +${CMAKE_CURRENT_LIST_DIR}/RigGridBase.h +${CMAKE_CURRENT_LIST_DIR}/RigGridManager.h +${CMAKE_CURRENT_LIST_DIR}/RigResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RigResultAccessorFactory.h +${CMAKE_CURRENT_LIST_DIR}/RigAllGridCellsResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RigActiveCellsResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RigCellEdgeResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.h +${CMAKE_CURRENT_LIST_DIR}/RigCombTransResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RigCombMultResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RigResultModifier.h +${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.h +${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.h +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultAddress.h +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.h +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultFrames.h +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagSolverInterface.h +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagInterfaceTools.h +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagStatCalc.h +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagVisibleCellsStatCalc.h +${CMAKE_CURRENT_LIST_DIR}/RigAccWellFlowCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractor.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseWellLogExtractor.h +${CMAKE_CURRENT_LIST_DIR}/RigLocalGrid.h +${CMAKE_CURRENT_LIST_DIR}/RigMainGrid.h +${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilderMock.h +${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultsData.h +${CMAKE_CURRENT_LIST_DIR}/RigSimWellData.h +${CMAKE_CURRENT_LIST_DIR}/RigWellPath.h +${CMAKE_CURRENT_LIST_DIR}/RigFault.h +${CMAKE_CURRENT_LIST_DIR}/RigNNCData.h +${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools.h +${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools.inl +${CMAKE_CURRENT_LIST_DIR}/RigPipeInCellEvaluator.h +${CMAKE_CURRENT_LIST_DIR}/RigTernaryResultAccessor2d.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeStatCalc.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeVisibleCellsStatCalc.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.h +${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.h +${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractionTools.h +${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.h +${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RigCurveDataTools.h +${CMAKE_CURRENT_LIST_DIR}/RigObservedData.h +${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.h +${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.h +${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.h +${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.h +${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.h +${CMAKE_CURRENT_LIST_DIR}/RigWellPathIntersectionTools.h +${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultInfo.h +${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.h +${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.h +${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.h +${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryCurveMerger.h +${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.h +${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.h +${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.h +${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RigActiveCellInfo.cpp -${CEE_CURRENT_LIST_DIR}RigCell.cpp -${CEE_CURRENT_LIST_DIR}RigEclipseCaseData.cpp -${CEE_CURRENT_LIST_DIR}RigGridBase.cpp -${CEE_CURRENT_LIST_DIR}RigGridManager.cpp -${CEE_CURRENT_LIST_DIR}RigResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RigResultAccessorFactory.cpp -${CEE_CURRENT_LIST_DIR}RigAllGridCellsResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RigActiveCellsResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RigCellEdgeResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RigCellGeometryTools.cpp -${CEE_CURRENT_LIST_DIR}RigCombTransResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RigCombMultResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RigResultModifierFactory.cpp -${CEE_CURRENT_LIST_DIR}RigFormationNames.cpp -${CEE_CURRENT_LIST_DIR}RigFlowDiagResultAddress.cpp -${CEE_CURRENT_LIST_DIR}RigFlowDiagResults.cpp -${CEE_CURRENT_LIST_DIR}RigFlowDiagResultFrames.cpp -${CEE_CURRENT_LIST_DIR}RigFlowDiagSolverInterface.cpp -${CEE_CURRENT_LIST_DIR}RigFlowDiagStatCalc.cpp -${CEE_CURRENT_LIST_DIR}RigFlowDiagVisibleCellsStatCalc.cpp -${CEE_CURRENT_LIST_DIR}RigAccWellFlowCalculator.cpp -${CEE_CURRENT_LIST_DIR}RigWellLogExtractor.cpp -${CEE_CURRENT_LIST_DIR}RigEclipseWellLogExtractor.cpp -${CEE_CURRENT_LIST_DIR}RigLocalGrid.cpp -${CEE_CURRENT_LIST_DIR}RigMainGrid.cpp -${CEE_CURRENT_LIST_DIR}RigReservoirBuilderMock.cpp -${CEE_CURRENT_LIST_DIR}RigCaseCellResultsData.cpp -${CEE_CURRENT_LIST_DIR}RigSimWellData.cpp -${CEE_CURRENT_LIST_DIR}RigWellPath.cpp -${CEE_CURRENT_LIST_DIR}RigFault.cpp -${CEE_CURRENT_LIST_DIR}RigNNCData.cpp -${CEE_CURRENT_LIST_DIR}cvfGeometryTools.cpp -${CEE_CURRENT_LIST_DIR}RigTernaryResultAccessor2d.cpp -${CEE_CURRENT_LIST_DIR}RigEclipseNativeStatCalc.cpp -${CEE_CURRENT_LIST_DIR}RigEclipseNativeVisibleCellsStatCalc.cpp -${CEE_CURRENT_LIST_DIR}RigEclipseMultiPropertyStatCalc.cpp -${CEE_CURRENT_LIST_DIR}RigWellLogCurveData.cpp -${CEE_CURRENT_LIST_DIR}RigHexIntersectionTools.cpp -${CEE_CURRENT_LIST_DIR}RigTimeHistoryResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RigCurveDataTools.cpp -${CEE_CURRENT_LIST_DIR}RigObservedData.cpp -${CEE_CURRENT_LIST_DIR}RigLasFileExporter.cpp -${CEE_CURRENT_LIST_DIR}RigSimulationWellCoordsAndMD.cpp -${CEE_CURRENT_LIST_DIR}RigFishbonesGeometry.cpp -${CEE_CURRENT_LIST_DIR}RigTesselatorTools.cpp -${CEE_CURRENT_LIST_DIR}RigCellGeometryTools.cpp -${CEE_CURRENT_LIST_DIR}RigWellPathIntersectionTools.cpp -${CEE_CURRENT_LIST_DIR}RigEclipseResultInfo.cpp -${CEE_CURRENT_LIST_DIR}RigTofAccumulatedPhaseFractionsCalculator.cpp -${CEE_CURRENT_LIST_DIR}RigTransmissibilityEquations.cpp -${CEE_CURRENT_LIST_DIR}RigNumberOfFloodedPoreVolumesCalculator.cpp -${CEE_CURRENT_LIST_DIR}RigWeightedMeanCalc.cpp -${CEE_CURRENT_LIST_DIR}RigTimeHistoryCurveMerger.cpp -${CEE_CURRENT_LIST_DIR}RigWellPathFormations.cpp -${CEE_CURRENT_LIST_DIR}RigStimPlanFractureDefinition.cpp -${CEE_CURRENT_LIST_DIR}RigFractureGrid.cpp -${CEE_CURRENT_LIST_DIR}RigFractureCell.cpp +${CMAKE_CURRENT_LIST_DIR}/RigActiveCellInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCell.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseCaseData.cpp +${CMAKE_CURRENT_LIST_DIR}/RigGridBase.cpp +${CMAKE_CURRENT_LIST_DIR}/RigGridManager.cpp +${CMAKE_CURRENT_LIST_DIR}/RigResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigResultAccessorFactory.cpp +${CMAKE_CURRENT_LIST_DIR}/RigAllGridCellsResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigActiveCellsResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCellEdgeResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCombTransResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCombMultResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigResultModifierFactory.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFormationNames.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultAddress.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResults.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagResultFrames.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagSolverInterface.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagStatCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFlowDiagVisibleCellsStatCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RigAccWellFlowCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWellLogExtractor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseWellLogExtractor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigLocalGrid.cpp +${CMAKE_CURRENT_LIST_DIR}/RigMainGrid.cpp +${CMAKE_CURRENT_LIST_DIR}/RigReservoirBuilderMock.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultsData.cpp +${CMAKE_CURRENT_LIST_DIR}/RigSimWellData.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWellPath.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFault.cpp +${CMAKE_CURRENT_LIST_DIR}/RigNNCData.cpp +${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTernaryResultAccessor2d.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeStatCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseNativeVisibleCellsStatCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseMultiPropertyStatCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWellLogCurveData.cpp +${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCurveDataTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RigObservedData.cpp +${CMAKE_CURRENT_LIST_DIR}/RigLasFileExporter.cpp +${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCoordsAndMD.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFishbonesGeometry.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTesselatorTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWellPathIntersectionTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RigEclipseResultInfo.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityEquations.cpp +${CMAKE_CURRENT_LIST_DIR}/RigNumberOfFloodedPoreVolumesCalculator.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWeightedMeanCalc.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTimeHistoryCurveMerger.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWellPathFormations.cpp +${CMAKE_CURRENT_LIST_DIR}/RigStimPlanFractureDefinition.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFractureGrid.cpp +${CMAKE_CURRENT_LIST_DIR}/RigFractureCell.cpp ) list(APPEND CODE_HEADER_FILES @@ -140,4 +135,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ReservoirDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "ReservoirDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake b/ApplicationCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake index d54e923649..8de6209ac7 100644 --- a/ApplicationCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake +++ b/ApplicationCode/ReservoirDataModel/CMakeLists_filesNotToUnitTest.cmake @@ -1,27 +1,22 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES - ${CEE_CURRENT_LIST_DIR}RigGeoMechWellLogExtractor.h - ${CEE_CURRENT_LIST_DIR}RigCaseToCaseCellMapper.h - ${CEE_CURRENT_LIST_DIR}RigCaseToCaseCellMapperTools.h - ${CEE_CURRENT_LIST_DIR}RigCaseToCaseRangeFilterMapper.h - ${CEE_CURRENT_LIST_DIR}RigSimulationWellCenterLineCalculator.h - ${CEE_CURRENT_LIST_DIR}RigWellLogFile.h - ${CEE_CURRENT_LIST_DIR}RigReservoirGridTools.h + ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechWellLogExtractor.h + ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapper.h + ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.h + ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.h + ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.h + ${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.h + ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.h ) set (SOURCE_GROUP_SOURCE_FILES - ${CEE_CURRENT_LIST_DIR}RigGeoMechWellLogExtractor.cpp - ${CEE_CURRENT_LIST_DIR}RigCaseToCaseCellMapper.cpp - ${CEE_CURRENT_LIST_DIR}RigCaseToCaseCellMapperTools.cpp - ${CEE_CURRENT_LIST_DIR}RigCaseToCaseRangeFilterMapper.cpp - ${CEE_CURRENT_LIST_DIR}RigSimulationWellCenterLineCalculator.cpp - ${CEE_CURRENT_LIST_DIR}RigWellLogFile.cpp - ${CEE_CURRENT_LIST_DIR}RigReservoirGridTools.cpp + ${CMAKE_CURRENT_LIST_DIR}/RigGeoMechWellLogExtractor.cpp + ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapper.cpp + ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseCellMapperTools.cpp + ${CMAKE_CURRENT_LIST_DIR}/RigCaseToCaseRangeFilterMapper.cpp + ${CMAKE_CURRENT_LIST_DIR}/RigSimulationWellCenterLineCalculator.cpp + ${CMAKE_CURRENT_LIST_DIR}/RigWellLogFile.cpp + ${CMAKE_CURRENT_LIST_DIR}/RigReservoirGridTools.cpp ) list(APPEND CODE_HEADER_FILES @@ -32,4 +27,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "ReservoirDataModel2" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_filesNotToUnitTest.cmake ) +source_group( "ReservoirDataModel2" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_filesNotToUnitTest.cmake ) diff --git a/ApplicationCode/ResultStatisticsCache/CMakeLists.txt b/ApplicationCode/ResultStatisticsCache/CMakeLists.txt index 4ac1d30def..d3385421c2 100644 --- a/ApplicationCode/ResultStatisticsCache/CMakeLists.txt +++ b/ApplicationCode/ResultStatisticsCache/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (ResultStatisticsCache) @@ -15,4 +15,11 @@ add_library( ${PROJECT_NAME} RigStatisticsMath.cpp ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + target_link_libraries(${PROJECT_NAME} LibCore) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/ApplicationCode/UnitTests/CMakeLists_files.cmake b/ApplicationCode/UnitTests/CMakeLists_files.cmake index 234b6d798a..bfb8bc7804 100644 --- a/ApplicationCode/UnitTests/CMakeLists_files.cmake +++ b/ApplicationCode/UnitTests/CMakeLists_files.cmake @@ -1,10 +1,5 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - -CONFIGURE_FILE( ${CEE_CURRENT_LIST_DIR}RiaTestDataDirectory.h.cmake +CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/RiaTestDataDirectory.h.cmake ${CMAKE_BINARY_DIR}/Generated/RiaTestDataDirectory.h ) @@ -12,37 +7,37 @@ set (SOURCE_GROUP_HEADER_FILES ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}cvfGeometryTools-Test.cpp -${CEE_CURRENT_LIST_DIR}Ert-Test.cpp -${CEE_CURRENT_LIST_DIR}RifcCommandCore-Test.cpp -${CEE_CURRENT_LIST_DIR}RifEclipseInputFileTools-Test.cpp -${CEE_CURRENT_LIST_DIR}RifReaderEclipseOutput-Test.cpp -${CEE_CURRENT_LIST_DIR}RifReaderEclipseSummary-Test.cpp -${CEE_CURRENT_LIST_DIR}RigActiveCellInfo-Test.cpp -${CEE_CURRENT_LIST_DIR}RigReservoir-Test.cpp -${CEE_CURRENT_LIST_DIR}RigStatisticsMath-Test.cpp -${CEE_CURRENT_LIST_DIR}RigWellPathIntersectionTools-Test.cpp -${CEE_CURRENT_LIST_DIR}RimWellLogExtractionCurveImpl-Test.cpp -${CEE_CURRENT_LIST_DIR}RivPipeGeometryGenerator-Test.cpp -${CEE_CURRENT_LIST_DIR}RivTernaryScalarMapper-Test.cpp -${CEE_CURRENT_LIST_DIR}ScalarMapper-Test.cpp -${CEE_CURRENT_LIST_DIR}WellPathAsciiFileReader-Test.cpp -${CEE_CURRENT_LIST_DIR}opm-flowdiagnostics-Test.cpp -${CEE_CURRENT_LIST_DIR}RigTofAccumulatedPhaseFractionsCalculator-Test.cpp -${CEE_CURRENT_LIST_DIR}HDF5FileReader-Test.cpp -${CEE_CURRENT_LIST_DIR}RigCellGeometryTools-Test.cpp -${CEE_CURRENT_LIST_DIR}RigHexIntersectionTools-Test.cpp -${CEE_CURRENT_LIST_DIR}ObservedDataParser-Test.cpp -${CEE_CURRENT_LIST_DIR}EclipseRftReader-Test.cpp -${CEE_CURRENT_LIST_DIR}RicExpressionParser-Test.cpp -${CEE_CURRENT_LIST_DIR}RiuSummaryVectorDescriptionMap-Test.cpp -${CEE_CURRENT_LIST_DIR}FixedWidthDataParser-Test.cpp -${CEE_CURRENT_LIST_DIR}RigTimeCurveHistoryMerger-Test.cpp -${CEE_CURRENT_LIST_DIR}ListKeywordsForObjectsAndFields-Test.cpp -${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools-Test.cpp -${CEE_CURRENT_LIST_DIR}RifElementPropertyTableReader-Test.cpp -${CEE_CURRENT_LIST_DIR}RimRelocatePath-Test.cpp -${CEE_CURRENT_LIST_DIR}RigTransmissibilityCondenser-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/cvfGeometryTools-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/Ert-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RifcCommandCore-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputFileTools-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseOutput-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RifReaderEclipseSummary-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigActiveCellInfo-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigReservoir-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigStatisticsMath-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigWellPathIntersectionTools-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RimWellLogExtractionCurveImpl-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RivPipeGeometryGenerator-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RivTernaryScalarMapper-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/ScalarMapper-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/WellPathAsciiFileReader-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/opm-flowdiagnostics-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTofAccumulatedPhaseFractionsCalculator-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/HDF5FileReader-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigCellGeometryTools-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigHexIntersectionTools-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/ObservedDataParser-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/EclipseRftReader-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RicExpressionParser-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorDescriptionMap-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/FixedWidthDataParser-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTimeCurveHistoryMerger-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/ListKeywordsForObjectsAndFields-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileVersionTools-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RifElementPropertyTableReader-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RimRelocatePath-Test.cpp +${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityCondenser-Test.cpp ) list(APPEND CODE_HEADER_FILES @@ -53,4 +48,4 @@ list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES} ) -source_group( "UnitTests" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "UnitTests" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/UserInterface/CMakeLists_files.cmake b/ApplicationCode/UserInterface/CMakeLists_files.cmake index 39736ae65e..76c6a6cc73 100644 --- a/ApplicationCode/UserInterface/CMakeLists_files.cmake +++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake @@ -1,144 +1,139 @@ -# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly -if (${CMAKE_VERSION} VERSION_GREATER "2.8.2") - set(CEE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_DIR}/) -endif() - set (SOURCE_GROUP_HEADER_FILES -${CEE_CURRENT_LIST_DIR}RiuCadNavigation.h -${CEE_CURRENT_LIST_DIR}RiuCursors.h -${CEE_CURRENT_LIST_DIR}RiuDragDrop.h -${CEE_CURRENT_LIST_DIR}RiuFemResultTextBuilder.h -${CEE_CURRENT_LIST_DIR}RiuGeoQuestNavigation.h -${CEE_CURRENT_LIST_DIR}RiuInterfaceToViewWindow.h -${CEE_CURRENT_LIST_DIR}RiuLineSegmentQwtPlotCurve.h -${CEE_CURRENT_LIST_DIR}RiuMainPlotWindow.h -${CEE_CURRENT_LIST_DIR}RiuMainWindow.h -${CEE_CURRENT_LIST_DIR}RiuMainWindowBase.h -${CEE_CURRENT_LIST_DIR}RiuMdiSubWindow.h -${CEE_CURRENT_LIST_DIR}RiuMultiCaseImportDialog.h -${CEE_CURRENT_LIST_DIR}RiuProcessMonitor.h -${CEE_CURRENT_LIST_DIR}RiuProjectPropertyView.h -${CEE_CURRENT_LIST_DIR}RiuPropertyViewTabWidget.h -${CEE_CURRENT_LIST_DIR}RiuPvtPlotPanel.h -${CEE_CURRENT_LIST_DIR}RiuPvtPlotUpdater.h -${CEE_CURRENT_LIST_DIR}RiuQwtScalePicker.h -${CEE_CURRENT_LIST_DIR}RiuQwtCurvePointTracker.h -${CEE_CURRENT_LIST_DIR}RiuQwtPlotWheelZoomer.h -${CEE_CURRENT_LIST_DIR}RiuQwtPlotZoomer.h -${CEE_CURRENT_LIST_DIR}RiuRecentFileActionProvider.h -${CEE_CURRENT_LIST_DIR}RiuRelativePermeabilityPlotPanel.h -${CEE_CURRENT_LIST_DIR}RiuRelativePermeabilityPlotUpdater.h -${CEE_CURRENT_LIST_DIR}RiuResultInfoPanel.h -${CEE_CURRENT_LIST_DIR}RiuResultQwtPlot.h -${CEE_CURRENT_LIST_DIR}RiuResultTextBuilder.h -${CEE_CURRENT_LIST_DIR}RiuRmsNavigation.h -${CEE_CURRENT_LIST_DIR}RiuSelectionChangedHandler.h -${CEE_CURRENT_LIST_DIR}RiuSelectionManager.h -${CEE_CURRENT_LIST_DIR}RiuSimpleHistogramWidget.h -${CEE_CURRENT_LIST_DIR}RiuSummaryQwtPlot.h -${CEE_CURRENT_LIST_DIR}RiuTextDialog.h -${CEE_CURRENT_LIST_DIR}RiuTimeStepChangedHandler.h -${CEE_CURRENT_LIST_DIR}RiuTofAccumulatedPhaseFractionsPlot.h -${CEE_CURRENT_LIST_DIR}RiuToolTipMenu.h -${CEE_CURRENT_LIST_DIR}RiuTreeViewEventFilter.h -${CEE_CURRENT_LIST_DIR}RiuViewer.h -${CEE_CURRENT_LIST_DIR}RiuViewerToViewInterface.h -${CEE_CURRENT_LIST_DIR}RiuViewerCommands.h -${CEE_CURRENT_LIST_DIR}RiuWellLogPlot.h -${CEE_CURRENT_LIST_DIR}RiuWellLogTrack.h -${CEE_CURRENT_LIST_DIR}RiuPlotAnnotationTool.h -${CEE_CURRENT_LIST_DIR}RiuGeoMechXfTensorResultAccessor.h -${CEE_CURRENT_LIST_DIR}RiuFemTimeHistoryResultAccessor.h -${CEE_CURRENT_LIST_DIR}RiuEditPerforationCollectionWidget.h -${CEE_CURRENT_LIST_DIR}RiuExportMultipleSnapshotsWidget.h -${CEE_CURRENT_LIST_DIR}RiuWellAllocationPlot.h -${CEE_CURRENT_LIST_DIR}RiuWellRftPlot.h -${CEE_CURRENT_LIST_DIR}RiuWellPltPlot.h -${CEE_CURRENT_LIST_DIR}RiuFlowCharacteristicsPlot.h -${CEE_CURRENT_LIST_DIR}RiuNightchartsWidget.h -${CEE_CURRENT_LIST_DIR}RiuMessagePanel.h -${CEE_CURRENT_LIST_DIR}RiuPlotObjectPicker.h -${CEE_CURRENT_LIST_DIR}RiuContextMenuLauncher.h -${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefinitionKeywords.h -${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.h -${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.h -${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.h -${CEE_CURRENT_LIST_DIR}RiuSummaryVectorDescriptionMap.h -${CEE_CURRENT_LIST_DIR}RiuExpressionContextMenuManager.h -${CEE_CURRENT_LIST_DIR}RiuCalculationsContextMenuManager.h -${CEE_CURRENT_LIST_DIR}RiuGridStatisticsHistogramWidget.h -${CEE_CURRENT_LIST_DIR}RiuTools.h -${CEE_CURRENT_LIST_DIR}RiuMohrsCirclePlot.h -${CEE_CURRENT_LIST_DIR}RiuPlotMainWindowTools.h -${CEE_CURRENT_LIST_DIR}Riu3DMainWindowTools.h +${CMAKE_CURRENT_LIST_DIR}/RiuCadNavigation.h +${CMAKE_CURRENT_LIST_DIR}/RiuCursors.h +${CMAKE_CURRENT_LIST_DIR}/RiuDragDrop.h +${CMAKE_CURRENT_LIST_DIR}/RiuFemResultTextBuilder.h +${CMAKE_CURRENT_LIST_DIR}/RiuGeoQuestNavigation.h +${CMAKE_CURRENT_LIST_DIR}/RiuInterfaceToViewWindow.h +${CMAKE_CURRENT_LIST_DIR}/RiuLineSegmentQwtPlotCurve.h +${CMAKE_CURRENT_LIST_DIR}/RiuMainPlotWindow.h +${CMAKE_CURRENT_LIST_DIR}/RiuMainWindow.h +${CMAKE_CURRENT_LIST_DIR}/RiuMainWindowBase.h +${CMAKE_CURRENT_LIST_DIR}/RiuMdiSubWindow.h +${CMAKE_CURRENT_LIST_DIR}/RiuMultiCaseImportDialog.h +${CMAKE_CURRENT_LIST_DIR}/RiuProcessMonitor.h +${CMAKE_CURRENT_LIST_DIR}/RiuProjectPropertyView.h +${CMAKE_CURRENT_LIST_DIR}/RiuPropertyViewTabWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuPvtPlotPanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuPvtPlotUpdater.h +${CMAKE_CURRENT_LIST_DIR}/RiuQwtScalePicker.h +${CMAKE_CURRENT_LIST_DIR}/RiuQwtCurvePointTracker.h +${CMAKE_CURRENT_LIST_DIR}/RiuQwtPlotWheelZoomer.h +${CMAKE_CURRENT_LIST_DIR}/RiuQwtPlotZoomer.h +${CMAKE_CURRENT_LIST_DIR}/RiuRecentFileActionProvider.h +${CMAKE_CURRENT_LIST_DIR}/RiuRelativePermeabilityPlotPanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuRelativePermeabilityPlotUpdater.h +${CMAKE_CURRENT_LIST_DIR}/RiuResultInfoPanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuResultQwtPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuResultTextBuilder.h +${CMAKE_CURRENT_LIST_DIR}/RiuRmsNavigation.h +${CMAKE_CURRENT_LIST_DIR}/RiuSelectionChangedHandler.h +${CMAKE_CURRENT_LIST_DIR}/RiuSelectionManager.h +${CMAKE_CURRENT_LIST_DIR}/RiuSimpleHistogramWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQwtPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuTextDialog.h +${CMAKE_CURRENT_LIST_DIR}/RiuTimeStepChangedHandler.h +${CMAKE_CURRENT_LIST_DIR}/RiuTofAccumulatedPhaseFractionsPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuToolTipMenu.h +${CMAKE_CURRENT_LIST_DIR}/RiuTreeViewEventFilter.h +${CMAKE_CURRENT_LIST_DIR}/RiuViewer.h +${CMAKE_CURRENT_LIST_DIR}/RiuViewerToViewInterface.h +${CMAKE_CURRENT_LIST_DIR}/RiuViewerCommands.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellLogPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellLogTrack.h +${CMAKE_CURRENT_LIST_DIR}/RiuPlotAnnotationTool.h +${CMAKE_CURRENT_LIST_DIR}/RiuGeoMechXfTensorResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RiuFemTimeHistoryResultAccessor.h +${CMAKE_CURRENT_LIST_DIR}/RiuEditPerforationCollectionWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuExportMultipleSnapshotsWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellAllocationPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellRftPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellPltPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuFlowCharacteristicsPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuNightchartsWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuMessagePanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.h +${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefinitionKeywords.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionDialog.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorDescriptionMap.h +${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.h +${CMAKE_CURRENT_LIST_DIR}/RiuCalculationsContextMenuManager.h +${CMAKE_CURRENT_LIST_DIR}/RiuGridStatisticsHistogramWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuTools.h +${CMAKE_CURRENT_LIST_DIR}/RiuMohrsCirclePlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuPlotMainWindowTools.h +${CMAKE_CURRENT_LIST_DIR}/Riu3DMainWindowTools.h ) set (SOURCE_GROUP_SOURCE_FILES -${CEE_CURRENT_LIST_DIR}RiuCadNavigation.cpp -${CEE_CURRENT_LIST_DIR}RiuCursors.cpp -${CEE_CURRENT_LIST_DIR}RiuDragDrop.cpp -${CEE_CURRENT_LIST_DIR}RiuFemResultTextBuilder.cpp -${CEE_CURRENT_LIST_DIR}RiuGeoQuestNavigation.cpp -${CEE_CURRENT_LIST_DIR}RiuInterfaceToViewWindow.cpp -${CEE_CURRENT_LIST_DIR}RiuLineSegmentQwtPlotCurve.cpp -${CEE_CURRENT_LIST_DIR}RiuMainPlotWindow.cpp -${CEE_CURRENT_LIST_DIR}RiuMainWindow.cpp -${CEE_CURRENT_LIST_DIR}RiuMainWindowBase.cpp -${CEE_CURRENT_LIST_DIR}RiuMdiSubWindow.cpp -${CEE_CURRENT_LIST_DIR}RiuMultiCaseImportDialog.cpp -${CEE_CURRENT_LIST_DIR}RiuProcessMonitor.cpp -${CEE_CURRENT_LIST_DIR}RiuProjectPropertyView.cpp -${CEE_CURRENT_LIST_DIR}RiuPropertyViewTabWidget.cpp -${CEE_CURRENT_LIST_DIR}RiuPvtPlotPanel.cpp -${CEE_CURRENT_LIST_DIR}RiuPvtPlotUpdater.cpp -${CEE_CURRENT_LIST_DIR}RiuQwtScalePicker.cpp -${CEE_CURRENT_LIST_DIR}RiuQwtCurvePointTracker.cpp -${CEE_CURRENT_LIST_DIR}RiuQwtPlotWheelZoomer.cpp -${CEE_CURRENT_LIST_DIR}RiuRecentFileActionProvider.cpp -${CEE_CURRENT_LIST_DIR}RiuRelativePermeabilityPlotPanel.cpp -${CEE_CURRENT_LIST_DIR}RiuRelativePermeabilityPlotUpdater.cpp -${CEE_CURRENT_LIST_DIR}RiuResultInfoPanel.cpp -${CEE_CURRENT_LIST_DIR}RiuResultQwtPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuResultTextBuilder.cpp -${CEE_CURRENT_LIST_DIR}RiuRmsNavigation.cpp -${CEE_CURRENT_LIST_DIR}RiuSelectionChangedHandler.cpp -${CEE_CURRENT_LIST_DIR}RiuSelectionManager.cpp -${CEE_CURRENT_LIST_DIR}RiuSimpleHistogramWidget.cpp -${CEE_CURRENT_LIST_DIR}RiuSummaryQwtPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuTextDialog.cpp -${CEE_CURRENT_LIST_DIR}RiuTimeStepChangedHandler.cpp -${CEE_CURRENT_LIST_DIR}RiuTofAccumulatedPhaseFractionsPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuToolTipMenu.cpp -${CEE_CURRENT_LIST_DIR}RiuTreeViewEventFilter.cpp -${CEE_CURRENT_LIST_DIR}RiuViewer.cpp -${CEE_CURRENT_LIST_DIR}RiuViewerCommands.cpp -${CEE_CURRENT_LIST_DIR}RiuWellLogPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuWellLogTrack.cpp -${CEE_CURRENT_LIST_DIR}RiuPlotAnnotationTool.cpp -${CEE_CURRENT_LIST_DIR}RiuGeoMechXfTensorResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RiuFemTimeHistoryResultAccessor.cpp -${CEE_CURRENT_LIST_DIR}RiuEditPerforationCollectionWidget.cpp -${CEE_CURRENT_LIST_DIR}RiuExportMultipleSnapshotsWidget.cpp -${CEE_CURRENT_LIST_DIR}RiuWellAllocationPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuWellRftPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuWellPltPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuFlowCharacteristicsPlot.cpp -${CEE_CURRENT_LIST_DIR}RiuNightchartsWidget.cpp -${CEE_CURRENT_LIST_DIR}RiuMessagePanel.cpp -${CEE_CURRENT_LIST_DIR}RiuPlotObjectPicker.cpp -${CEE_CURRENT_LIST_DIR}RiuContextMenuLauncher.cpp -${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.cpp -${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.cpp -${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.cpp -${CEE_CURRENT_LIST_DIR}RiuSummaryVectorDescriptionMap.cpp -${CEE_CURRENT_LIST_DIR}RiuExpressionContextMenuManager.cpp -${CEE_CURRENT_LIST_DIR}RiuCalculationsContextMenuManager.cpp -${CEE_CURRENT_LIST_DIR}RiuGridStatisticsHistogramWidget.cpp -${CEE_CURRENT_LIST_DIR}RiuTools.cpp -${CEE_CURRENT_LIST_DIR}RiuMohrsCirclePlot.cpp -${CEE_CURRENT_LIST_DIR}RiuPlotMainWindowTools.cpp -${CEE_CURRENT_LIST_DIR}Riu3DMainWindowTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuCadNavigation.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuCursors.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuDragDrop.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuFemResultTextBuilder.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuGeoQuestNavigation.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuInterfaceToViewWindow.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuLineSegmentQwtPlotCurve.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuMainPlotWindow.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuMainWindow.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuMainWindowBase.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuMdiSubWindow.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuMultiCaseImportDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuProcessMonitor.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuProjectPropertyView.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuPropertyViewTabWidget.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuPvtPlotPanel.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuPvtPlotUpdater.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuQwtScalePicker.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuQwtCurvePointTracker.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuQwtPlotWheelZoomer.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuRecentFileActionProvider.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuRelativePermeabilityPlotPanel.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuRelativePermeabilityPlotUpdater.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuResultInfoPanel.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuResultQwtPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuResultTextBuilder.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuRmsNavigation.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSelectionChangedHandler.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSelectionManager.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSimpleHistogramWidget.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQwtPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuTextDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuTimeStepChangedHandler.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuTofAccumulatedPhaseFractionsPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuToolTipMenu.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuTreeViewEventFilter.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuViewer.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuViewerCommands.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuWellLogPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuWellLogTrack.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuPlotAnnotationTool.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuGeoMechXfTensorResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuFemTimeHistoryResultAccessor.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuEditPerforationCollectionWidget.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuExportMultipleSnapshotsWidget.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuWellAllocationPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuWellRftPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuWellPltPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuFlowCharacteristicsPlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuNightchartsWidget.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuMessagePanel.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorDescriptionMap.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuCalculationsContextMenuManager.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuGridStatisticsHistogramWidget.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuTools.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuMohrsCirclePlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuPlotMainWindowTools.cpp +${CMAKE_CURRENT_LIST_DIR}/Riu3DMainWindowTools.cpp ) list(APPEND CODE_HEADER_FILES @@ -150,41 +145,41 @@ ${SOURCE_GROUP_SOURCE_FILES} ) list(APPEND QT_MOC_HEADERS -${CEE_CURRENT_LIST_DIR}RiuMainWindowBase.h -${CEE_CURRENT_LIST_DIR}RiuMainWindow.h -${CEE_CURRENT_LIST_DIR}RiuMainPlotWindow.h -${CEE_CURRENT_LIST_DIR}RiuPvtPlotPanel.h -${CEE_CURRENT_LIST_DIR}RiuRelativePermeabilityPlotPanel.h -${CEE_CURRENT_LIST_DIR}RiuResultInfoPanel.h -${CEE_CURRENT_LIST_DIR}RiuResultQwtPlot.h -${CEE_CURRENT_LIST_DIR}RiuTextDialog.h -${CEE_CURRENT_LIST_DIR}RiuViewer.h -${CEE_CURRENT_LIST_DIR}RiuProcessMonitor.h -${CEE_CURRENT_LIST_DIR}RiuMultiCaseImportDialog.h -${CEE_CURRENT_LIST_DIR}RiuViewerCommands.h -${CEE_CURRENT_LIST_DIR}RiuTreeViewEventFilter.h -${CEE_CURRENT_LIST_DIR}RiuWellLogPlot.h -${CEE_CURRENT_LIST_DIR}RiuWellLogTrack.h -${CEE_CURRENT_LIST_DIR}RiuRecentFileActionProvider.h -${CEE_CURRENT_LIST_DIR}RiuSummaryQwtPlot.h -${CEE_CURRENT_LIST_DIR}RiuTofAccumulatedPhaseFractionsPlot.h -${CEE_CURRENT_LIST_DIR}RiuQwtScalePicker.h -${CEE_CURRENT_LIST_DIR}RiuQwtPlotWheelZoomer.h -${CEE_CURRENT_LIST_DIR}RiuEditPerforationCollectionWidget.h -${CEE_CURRENT_LIST_DIR}RiuExportMultipleSnapshotsWidget.h -${CEE_CURRENT_LIST_DIR}RiuWellAllocationPlot.h -${CEE_CURRENT_LIST_DIR}RiuWellRftPlot.h -${CEE_CURRENT_LIST_DIR}RiuWellPltPlot.h -${CEE_CURRENT_LIST_DIR}RiuFlowCharacteristicsPlot.h -${CEE_CURRENT_LIST_DIR}RiuNightchartsWidget.h -${CEE_CURRENT_LIST_DIR}RiuMessagePanel.h -${CEE_CURRENT_LIST_DIR}RiuExpressionContextMenuManager.h -${CEE_CURRENT_LIST_DIR}RiuCalculationsContextMenuManager.h -${CEE_CURRENT_LIST_DIR}RiuMohrsCirclePlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuMainWindowBase.h +${CMAKE_CURRENT_LIST_DIR}/RiuMainWindow.h +${CMAKE_CURRENT_LIST_DIR}/RiuMainPlotWindow.h +${CMAKE_CURRENT_LIST_DIR}/RiuPvtPlotPanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuRelativePermeabilityPlotPanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuResultInfoPanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuResultQwtPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuTextDialog.h +${CMAKE_CURRENT_LIST_DIR}/RiuViewer.h +${CMAKE_CURRENT_LIST_DIR}/RiuProcessMonitor.h +${CMAKE_CURRENT_LIST_DIR}/RiuMultiCaseImportDialog.h +${CMAKE_CURRENT_LIST_DIR}/RiuViewerCommands.h +${CMAKE_CURRENT_LIST_DIR}/RiuTreeViewEventFilter.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellLogPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellLogTrack.h +${CMAKE_CURRENT_LIST_DIR}/RiuRecentFileActionProvider.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQwtPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuTofAccumulatedPhaseFractionsPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuQwtScalePicker.h +${CMAKE_CURRENT_LIST_DIR}/RiuQwtPlotWheelZoomer.h +${CMAKE_CURRENT_LIST_DIR}/RiuEditPerforationCollectionWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuExportMultipleSnapshotsWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellAllocationPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellRftPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuWellPltPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuFlowCharacteristicsPlot.h +${CMAKE_CURRENT_LIST_DIR}/RiuNightchartsWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuMessagePanel.h +${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.h +${CMAKE_CURRENT_LIST_DIR}/RiuCalculationsContextMenuManager.h +${CMAKE_CURRENT_LIST_DIR}/RiuMohrsCirclePlot.h ) list(APPEND QT_UI_FILES -${CEE_CURRENT_LIST_DIR}RiuMultiCaseImportDialog.ui +${CMAKE_CURRENT_LIST_DIR}/RiuMultiCaseImportDialog.ui ) -source_group( "UserInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake ) +source_group( "UserInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationCode/UserInterface/RiuNightchartsWidget.h b/ApplicationCode/UserInterface/RiuNightchartsWidget.h index 777b112d96..0a0ba6df5a 100644 --- a/ApplicationCode/UserInterface/RiuNightchartsWidget.h +++ b/ApplicationCode/UserInterface/RiuNightchartsWidget.h @@ -19,7 +19,7 @@ #pragma once -#include "nightcharts/nightcharts.h" +#include "nightcharts.h" #include "cafPdmPointer.h" diff --git a/ApplicationCode/WellPathImportSsihub/CMakeLists.txt b/ApplicationCode/WellPathImportSsihub/CMakeLists.txt index 56cabdd553..acaa843178 100644 --- a/ApplicationCode/WellPathImportSsihub/CMakeLists.txt +++ b/ApplicationCode/WellPathImportSsihub/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (WellPathImportSsihub) @@ -11,7 +11,7 @@ set( QOBJECT_HEADERS set( QT_UI_FILES ) -if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) ) +if ( NOT CMAKE_AUTOMOC ) qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} ) qt4_wrap_ui( FORM_FILES_CPP ${QT_UI_FILES} ) endif() @@ -20,8 +20,6 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../FileInterface - ${CMAKE_CURRENT_SOURCE_DIR}/../../Fwk/AppFwk/cafProjectDataModel - ${CMAKE_CURRENT_SOURCE_DIR}/../../Fwk/AppFwk/cafUserInterface ) @@ -43,3 +41,9 @@ add_library( ${PROJECT_NAME} ${FORM_FILES_CPP} ${HEADER_FILES} ) + +target_link_libraries ( ${PROJECT_NAME} + cafUserInterface cafPdmCvf CommonCode +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/CMakeLists.txt b/CMakeLists.txt index eed49f6124..cdd7846467 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) include (CheckCSourceCompiles) project (ResInsight) @@ -332,14 +332,6 @@ add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibRender) add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibViewing) add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibGuiQt) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} -) - list(APPEND VIZ_FWK_LIBRARIES LibGuiQt LibViewing diff --git a/Fwk/AppFwk/CommonCode/CMakeLists.txt b/Fwk/AppFwk/CommonCode/CMakeLists.txt index ec5a12cd61..52e5193f4d 100644 --- a/Fwk/AppFwk/CommonCode/CMakeLists.txt +++ b/Fwk/AppFwk/CommonCode/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (CommonCode) @@ -9,16 +9,6 @@ include (${QT_USE_FILE}) # Open GL find_package( OpenGL ) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} - - ${cafPdmCore_SOURCE_DIR} -) - # These headers need to go through Qt's MOC compiler set( QOBJECT_HEADERS cafMessagePanel.h @@ -54,3 +44,22 @@ add_library( ${PROJECT_NAME} ${MOC_FILES_CPP} ) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry + LibViewing + LibRender + LibGuiQt + + cafPdmCore + + ${QT_LIBRARIES} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafAnimControl/CMakeLists.txt b/Fwk/AppFwk/cafAnimControl/CMakeLists.txt index fa400a77e2..4a4b41bffe 100644 --- a/Fwk/AppFwk/cafAnimControl/CMakeLists.txt +++ b/Fwk/AppFwk/cafAnimControl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (cafAnimControl) @@ -11,7 +11,7 @@ set( QOBJECT_HEADERS cafAnimationToolBar.h ) -if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) ) +if ( NOT CMAKE_AUTOMOC ) qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} ) endif() @@ -30,8 +30,21 @@ set( QRC_FILES PARENT_SCOPE ) -add_library( ${PROJECT_NAME} +set( PROJECT_FILES + cafFrameAnimationControl.h cafFrameAnimationControl.cpp + cafAnimationToolBar.h cafAnimationToolBar.cpp +) + +add_library( ${PROJECT_NAME} + ${PROJECT_FILES} ${MOC_FILES_CPP} ) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafCommand/CMakeLists.txt b/Fwk/AppFwk/cafCommand/CMakeLists.txt index c0dcef9c9b..4ebb3c9fed 100644 --- a/Fwk/AppFwk/cafCommand/CMakeLists.txt +++ b/Fwk/AppFwk/cafCommand/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) # Qt find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) @@ -6,16 +6,6 @@ include (${QT_USE_FILE}) project (cafCommand) -include_directories( - ${cafProjectDataModel_SOURCE_DIR} -) - -include_directories ( - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} - ${cafPdmXml_SOURCE_DIR} - . -) # These headers need to go through Qt's MOC compiler set( QOBJECT_HEADERS @@ -23,7 +13,7 @@ set( QOBJECT_HEADERS cafCmdFeatureManager.h ) -if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) ) +if ( NOT CMAKE_AUTOMOC ) qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} ) endif() @@ -71,4 +61,13 @@ add_library( ${PROJECT_NAME} ${MOC_FILES_CPP} ) -source_group("" FILES ${PROJECT_FILES}) \ No newline at end of file +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + cafProjectDataModel +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt index 6be4d2ef14..bafd45477d 100644 --- a/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt +++ b/Fwk/AppFwk/cafPdmCvf/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (cafPdmCvf) @@ -6,16 +6,6 @@ project (cafPdmCvf) find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) include (${QT_USE_FILE}) -include_directories( - ${LibCore_SOURCE_DIR} - ${cafProjectDataModel_SOURCE_DIR} - ${cafUserInterface_SOURCE_DIR} - - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} -) - - add_library( ${PROJECT_NAME} cafPdmCoreColor3f.h cafPdmUiCoreColor3f.cpp @@ -39,11 +29,15 @@ add_library( ${PROJECT_NAME} cafPdmFieldCvfMat4d.h ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + target_link_libraries ( ${PROJECT_NAME} - cafPdmCore - cafPdmUiCore cafUserInterface - cafProjectDataModel LibCore ${QT_LIBRARIES} ) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt index 7e451984f4..aab257286e 100644 --- a/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt @@ -6,12 +6,6 @@ project (cafProjectDataModel) find_package ( Qt4 COMPONENTS QtCore QtGui ) include (${QT_USE_FILE}) -include_directories ( - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} - ${cafPdmXml_SOURCE_DIR} -) - set( PROJECT_FILES cafFactory.h cafFixedArray.h @@ -28,4 +22,14 @@ add_library( ${PROJECT_NAME} ${PROJECT_FILES} ) -source_group("" FILES ${PROJECT_FILES}) \ No newline at end of file +target_link_libraries ( ${PROJECT_NAME} + cafPdmUiCore + cafPdmXml +) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt index 725ff7201f..40e8db36b0 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (cafPdmCore) @@ -6,9 +6,6 @@ project (cafPdmCore) find_package ( Qt4 COMPONENTS QtCore ) include (${QT_USE_FILE}) -include_directories ( -) - set( PROJECT_FILES cafAssert.h @@ -50,9 +47,13 @@ set( PROJECT_FILES cafFilePath.h ) - add_library( ${PROJECT_NAME} ${PROJECT_FILES} ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt index e6a0882885..ca70e46c3e 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) find_package ( Qt4 COMPONENTS QtCore QtGui ) include (${QT_USE_FILE}) @@ -6,8 +6,7 @@ include (${QT_USE_FILE}) project ( cafPdmCore_UnitTests ) include_directories ( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt index 4328e3caa4..45aa9428f7 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt @@ -7,8 +7,6 @@ find_package ( Qt4 COMPONENTS QtCore QtGui ) include (${QT_USE_FILE}) include_directories ( - - ${cafPdmCore_SOURCE_DIR} .. ) @@ -53,4 +51,13 @@ add_library( ${PROJECT_NAME} ${PROJECT_FILES} ) +target_link_libraries ( ${PROJECT_NAME} + cafPdmCore +) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt index 1ba575d743..01fa1d3fa6 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt @@ -8,7 +8,6 @@ include (${QT_USE_FILE}) include_directories ( .. - ${cafPdmCore_SOURCE_DIR} ) set( PROJECT_FILES @@ -45,4 +44,13 @@ add_library( ${PROJECT_NAME} ${PROJECT_FILES} ) -source_group("" FILES ${PROJECT_FILES}) \ No newline at end of file +target_link_libraries ( ${PROJECT_NAME} + cafPdmCore +) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt index 7a56128283..04b8e830cc 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) find_package ( Qt4 COMPONENTS QtCore ) include (${QT_USE_FILE}) @@ -6,12 +6,9 @@ include (${QT_USE_FILE}) project ( cafPdmXml_UnitTests ) include_directories ( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${cafPdmCore_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp ) - # add the executable add_executable (${PROJECT_NAME} cafPdmXml_UnitTests.cpp @@ -24,12 +21,13 @@ add_executable (${PROJECT_NAME} message(STATUS ${PROJECT_NAME}" - Qt includes : " ${QT_LIBRARIES}) target_link_libraries ( ${PROJECT_NAME} - cafPdmCore cafPdmXml ${QT_LIBRARIES} ${THREAD_LIBRARY} ) +source_group("" FILES ${PROJECT_FILES}) + # Copy Qt Dlls if (MSVC) set (QTLIBLIST QtCore ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt index 4ac2c8cec5..e1e29599ee 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) find_package ( Qt4 COMPONENTS QtCore QtGui ) include (${QT_USE_FILE}) @@ -6,25 +6,15 @@ include (${QT_USE_FILE}) project ( cafProjectDataModel_UnitTests ) include_directories ( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. -) - -include_directories ( - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} - ${cafPdmXml_SOURCE_DIR} - - ${cafProjectDataModel_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp ) set( PROJECT_FILES cafPdmBasicTest.cpp cafProjectDataModel_UnitTests.cpp - Child.cpp - Parent.cpp - TestObj.cpp - + Child.cpp + Parent.cpp + TestObj.cpp ) # add the executable @@ -35,9 +25,6 @@ add_executable (${PROJECT_NAME} message(${PROJECT_NAME}" - Qt includes : " ${QT_LIBRARIES}) target_link_libraries ( ${PROJECT_NAME} - cafPdmCore - cafPdmUiCore - cafPdmXml cafProjectDataModel ${QT_LIBRARIES} ${THREAD_LIBRARY} diff --git a/Fwk/AppFwk/cafTensor/CMakeLists.txt b/Fwk/AppFwk/cafTensor/CMakeLists.txt index 073a78e53a..d15a356c04 100644 --- a/Fwk/AppFwk/cafTensor/CMakeLists.txt +++ b/Fwk/AppFwk/cafTensor/CMakeLists.txt @@ -1,11 +1,7 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (cafTensor) -include_directories ( - ${LibCore_SOURCE_DIR} -) - set( PROJECT_FILES cafTensor3.cpp cafTensor3.h @@ -17,6 +13,11 @@ add_library( ${PROJECT_NAME} ${PROJECT_FILES} ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + target_link_libraries( ${PROJECT_NAME} LibCore ) -source_group("" FILES ${PROJECT_FILES}) \ No newline at end of file +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt index f03d2a90bd..b1fa180561 100644 --- a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt +++ b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) # Qt find_package ( Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl ) @@ -32,11 +32,6 @@ qt4_add_resources( QRC_FILES_CPP ${QRC_FILES} ) -include_directories ( - ${cafProjectDataModel_SOURCE_DIR} - ${cafUserInterface_SOURCE_DIR} -) - if (USE_COMMAND_FRAMEWORK) include_directories ( ${cafCommand_SOURCE_DIR} @@ -45,12 +40,6 @@ if (USE_COMMAND_FRAMEWORK) endif(USE_COMMAND_FRAMEWORK) -include_directories ( - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} - ${cafPdmXml_SOURCE_DIR} -) - set( PROJECT_FILES Main.cpp MainWindow.cpp @@ -75,7 +64,6 @@ add_executable ( ${PROJECT_NAME} set (TAP_LINK_LIBRARIES cafUserInterface - cafPdmXml ${QT_LIBRARIES} ) diff --git a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt index 29eeeb0a82..25cddf2a32 100644 --- a/Fwk/AppFwk/cafUserInterface/CMakeLists.txt +++ b/Fwk/AppFwk/cafUserInterface/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) # Qt find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) @@ -6,15 +6,6 @@ include (${QT_USE_FILE}) project (cafUserInterface) -include_directories( - ${cafProjectDataModel_SOURCE_DIR} -) - -include_directories ( - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} - ${cafPdmXml_SOURCE_DIR} -) # These headers need to go through Qt's MOC compiler set( QOBJECT_HEADERS @@ -51,7 +42,7 @@ set( QOBJECT_HEADERS cafPdmUiDoubleValueEditor.h ) -if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) ) +if ( NOT CMAKE_AUTOMOC ) qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} ) endif() @@ -154,10 +145,13 @@ add_library( ${PROJECT_NAME} ${MOC_FILES_CPP} ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + target_link_libraries ( ${PROJECT_NAME} cafProjectDataModel - cafPdmUiCore - cafPdmCore ${QT_LIBRARIES} ) diff --git a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt index 1644fccae9..7c717e4e31 100644 --- a/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) include (${QT_USE_FILE}) @@ -6,16 +6,7 @@ include (${QT_USE_FILE}) project ( cafUserInterface_UnitTests ) include_directories ( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - - ${cafProjectDataModel_SOURCE_DIR} - ${cafPdmCore_SOURCE_DIR} - ${cafPdmUiCore_SOURCE_DIR} - ${cafPdmXml_SOURCE_DIR} - - ${cafUserInterface_SOURCE_DIR} - + ${CMAKE_CURRENT_SOURCE_DIR} ) @@ -39,10 +30,6 @@ source_group("" FILES ${PROJECT_FILES}) message(STATUS ${PROJECT_NAME}" - Qt includes : " ${QT_LIBRARIES}) target_link_libraries ( ${PROJECT_NAME} - cafProjectDataModel - cafPdmUiCore - cafPdmCore - cafPdmXml cafUserInterface ${QT_LIBRARIES} ${THREAD_LIBRARY} diff --git a/Fwk/AppFwk/cafViewer/CMakeLists.txt b/Fwk/AppFwk/cafViewer/CMakeLists.txt index b0402fd991..2850fc3b0d 100644 --- a/Fwk/AppFwk/cafViewer/CMakeLists.txt +++ b/Fwk/AppFwk/cafViewer/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (cafViewer) @@ -6,22 +6,12 @@ project (cafViewer) find_package ( Qt4 COMPONENTS QtCore QtGui QtMain ) include (${QT_USE_FILE}) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} - - ${cafAnimControl_SOURCE_DIR} -) - # These headers need to go through Qt's MOC compiler set( QOBJECT_HEADERS cafViewer.h ) -if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) ) +if ( NOT CMAKE_AUTOMOC ) qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} ) endif() @@ -44,3 +34,22 @@ add_library( ${PROJECT_NAME} ${MOC_FILES_CPP} ) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry + LibViewing + LibRender + LibGuiQt + + cafAnimControl + + ${QT_LIBRARIES} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt b/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt index a743f3b293..783194cc35 100644 --- a/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt +++ b/Fwk/AppFwk/cafVizExtensions/CMakeLists.txt @@ -1,19 +1,10 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (cafVizExtensions) # Open GL find_package( OpenGL ) -include_directories( - ${LibCore_SOURCE_DIR} - ${LibGeometry_SOURCE_DIR} - ${LibGuiQt_SOURCE_DIR} - ${LibRender_SOURCE_DIR} - ${LibViewing_SOURCE_DIR} - ${CommonCode_SOURCE_DIR} -) - add_library( ${PROJECT_NAME} cafDisplayCoordTransform.cpp cafDisplayCoordTransform.h @@ -36,3 +27,22 @@ add_library( ${PROJECT_NAME} cafHexGridIntersectionTools/cafHexGridIntersectionTools.h cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp ) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry + LibViewing + LibRender + LibGuiQt + + CommonCode + + ${QT_LIBRARIES} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibCore/CMakeLists.txt b/Fwk/VizFwk/LibCore/CMakeLists.txt index 3ce19f6ec0..0637746261 100644 --- a/Fwk/VizFwk/LibCore/CMakeLists.txt +++ b/Fwk/VizFwk/LibCore/CMakeLists.txt @@ -100,3 +100,10 @@ cvfVector4.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibGeometry/CMakeLists.txt b/Fwk/VizFwk/LibGeometry/CMakeLists.txt index 6034118a2c..c18b0bd727 100644 --- a/Fwk/VizFwk/LibGeometry/CMakeLists.txt +++ b/Fwk/VizFwk/LibGeometry/CMakeLists.txt @@ -7,9 +7,6 @@ project(LibGeometry) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}") -include_directories(../LibCore) - - set(CEE_HEADER_FILES cvfArrowGenerator.h cvfBoundingBox.h @@ -57,3 +54,14 @@ cvfVertexWelder.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibGuiQt/CMakeLists.txt b/Fwk/VizFwk/LibGuiQt/CMakeLists.txt index 5184988103..b699af4960 100644 --- a/Fwk/VizFwk/LibGuiQt/CMakeLists.txt +++ b/Fwk/VizFwk/LibGuiQt/CMakeLists.txt @@ -14,13 +14,6 @@ endif() find_package(Qt4 REQUIRED) include(${QT_USE_FILE}) - -include_directories(../LibCore) -include_directories(../LibGeometry) -include_directories(../LibRender) -include_directories(../LibViewing) - - set(CEE_HEADER_FILES cvfqtBasicAboutDialog.h cvfqtCvfBoundQGLContext.h @@ -43,3 +36,18 @@ cvfqtUtils.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry + LibRender + LibViewing + + ${QT_LIBRARIES} +) +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibRender/CMakeLists.txt b/Fwk/VizFwk/LibRender/CMakeLists.txt index d2e28dee6c..73466d5e69 100644 --- a/Fwk/VizFwk/LibRender/CMakeLists.txt +++ b/Fwk/VizFwk/LibRender/CMakeLists.txt @@ -18,8 +18,6 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif() -include_directories(../LibCore) -include_directories(../LibGeometry) include_directories(glew) @@ -178,3 +176,15 @@ cvfViewport.cpp add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/Fwk/VizFwk/LibViewing/CMakeLists.txt b/Fwk/VizFwk/LibViewing/CMakeLists.txt index 7c40ee0661..28f5937fbd 100644 --- a/Fwk/VizFwk/LibViewing/CMakeLists.txt +++ b/Fwk/VizFwk/LibViewing/CMakeLists.txt @@ -6,12 +6,6 @@ project(LibViewing) # Use our strict compile flags set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}") - -include_directories(../LibCore) -include_directories(../LibGeometry) -include_directories(../LibRender) - - set(CEE_HEADER_FILES cvfClipPlaneSet.h cvfConstantFrameRate.h @@ -76,3 +70,17 @@ cvfTransform.cpp ) add_library(${PROJECT_NAME} ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +target_link_libraries ( ${PROJECT_NAME} + LibCore + LibGeometry + LibRender +) + +set(PROJECT_FILES ${CEE_HEADER_FILES} ${CEE_SOURCE_FILES}) +source_group("" FILES ${PROJECT_FILES}) diff --git a/ThirdParty/NRLib/CMakeLists.txt b/ThirdParty/NRLib/CMakeLists.txt index 215aba8f7c..0b865c0cf2 100644 --- a/ThirdParty/NRLib/CMakeLists.txt +++ b/ThirdParty/NRLib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (NRLib) @@ -6,8 +6,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/nrlib ${CMAKE_CURRENT_SOURCE_DIR}/nrlib/well - - ${boost-Subset_SOURCE_DIR} ) file ( GLOB NRLIB_IOTOOLS_SRC @@ -32,3 +30,11 @@ endif() add_subdirectory(well_UnitTests) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/nrlib/well +) + +target_link_libraries ( ${PROJECT_NAME} + boost-Subset +) diff --git a/ThirdParty/NRLib/well_UnitTests/CMakeLists.txt b/ThirdParty/NRLib/well_UnitTests/CMakeLists.txt index f8ff33b636..7938ccdb9a 100644 --- a/ThirdParty/NRLib/well_UnitTests/CMakeLists.txt +++ b/ThirdParty/NRLib/well_UnitTests/CMakeLists.txt @@ -4,11 +4,7 @@ project ( well_UnitTests ) include_directories ( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../.. - - ${NR_well_SOURCE_DIR} ) set( PROJECT_FILES @@ -28,6 +24,5 @@ source_group("" FILES ${PROJECT_FILES}) target_link_libraries ( ${PROJECT_NAME} NRLib - boost-Subset ) diff --git a/ThirdParty/Qwt/src/CMakeLists.txt b/ThirdParty/Qwt/src/CMakeLists.txt index 8844512282..46b51e9d7c 100644 --- a/ThirdParty/Qwt/src/CMakeLists.txt +++ b/ThirdParty/Qwt/src/CMakeLists.txt @@ -280,3 +280,8 @@ qt4_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) add_library(${PROJECT_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${MOC_SOURCE_FILES}) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + diff --git a/ThirdParty/boost-Subset/CMakeLists.txt b/ThirdParty/boost-Subset/CMakeLists.txt index 2fe351529e..5a94a45d8c 100644 --- a/ThirdParty/boost-Subset/CMakeLists.txt +++ b/ThirdParty/boost-Subset/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) # Procedure used to extract subset from complete Boost installation # @@ -36,3 +36,8 @@ add_library( ${PROJECT_NAME} if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4244") endif() + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) diff --git a/ThirdParty/clipper/CMakeLists.txt b/ThirdParty/clipper/CMakeLists.txt index 0a17507090..300964eeb3 100644 --- a/ThirdParty/clipper/CMakeLists.txt +++ b/ThirdParty/clipper/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (clipper) @@ -11,3 +11,9 @@ add_library(${PROJECT_NAME} ${project_source_files} ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt b/ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt index e0f850276e..c37bd33e02 100644 --- a/ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt +++ b/ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (custom-opm-flowdiag-app) @@ -6,7 +6,6 @@ include_directories( ../custom-opm-flowdiagnostics/opm-flowdiagnostics opm-flowdiagnostics-applications opmCore - ${boost-Subset_SOURCE_DIR} ) include (opm-flowdiagnostics-applications/CMakeLists_files.cmake) @@ -26,8 +25,16 @@ add_library(custom-opm-flowdiag-app ${project_source_files_complete_path1} ) -target_link_libraries(custom-opm-flowdiag-app ecl) +target_link_libraries(custom-opm-flowdiag-app + ecl + boost-Subset +) if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4190 /wd4267") endif() + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/opm-flowdiagnostics-applications +) diff --git a/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt b/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt index 3e072c7c1e..447ed4e265 100644 --- a/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt +++ b/ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt @@ -24,3 +24,8 @@ add_library(${PROJECT_NAME} if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4267") endif() + +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/opm-flowdiagnostics +) diff --git a/ThirdParty/expressionparser/CMakeLists.txt b/ThirdParty/expressionparser/CMakeLists.txt index e2e72d8383..4de3ad10bf 100644 --- a/ThirdParty/expressionparser/CMakeLists.txt +++ b/ThirdParty/expressionparser/CMakeLists.txt @@ -22,3 +22,10 @@ add_library( ${PROJECT_NAME} if(MSVC) set_target_properties(expressionparser PROPERTIES COMPILE_FLAGS "/wd4267") endif() + + target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +source_group("" FILES ${PROJECT_FILES}) diff --git a/ThirdParty/nightcharts/CMakeLists.txt b/ThirdParty/nightcharts/CMakeLists.txt index 287617a83d..3169a76e4c 100644 --- a/ThirdParty/nightcharts/CMakeLists.txt +++ b/ThirdParty/nightcharts/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) project (nightcharts) @@ -14,3 +14,9 @@ add_library( ${PROJECT_NAME} ${MAIN_SOURCE_FILES} ) +target_include_directories(${PROJECT_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) + +source_group("" FILES ${PROJECT_FILES})