OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes by cmake-format (#6874)

Browse Source
This commit is contained in:
github-actions[bot]
2020-10-30 12:31:16 +01:00
committed by GitHub
parent 787dae4044
commit 223fe756fe
33 changed files with 1870 additions and 2069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1157
ApplicationCode/CMakeLists.txt
View File

File diff suppressed because it is too large Load Diff

75
ApplicationCode/Commands/CMakeLists.txt
View File

@@ -1,14 +1,14 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (Commands) project(Commands)
# Unity Build # Unity Build
if (RESINSIGHT_ENABLE_UNITY_BUILD) if(RESINSIGHT_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
set( COMMAND_REFERENCED_CMAKE_FILES set(COMMAND_REFERENCED_CMAKE_FILES
CMakeLists_files.cmake CMakeLists_files.cmake
AnalysisPlotCommands/CMakeLists_files.cmake AnalysisPlotCommands/CMakeLists_files.cmake
ApplicationCommands/CMakeLists_files.cmake ApplicationCommands/CMakeLists_files.cmake
@@ -37,55 +37,46 @@ set( COMMAND_REFERENCED_CMAKE_FILES
WellLogCommands/CMakeLists_files.cmake WellLogCommands/CMakeLists_files.cmake
WellPathCommands/CMakeLists_files.cmake WellPathCommands/CMakeLists_files.cmake
PlotTemplateCommands/CMakeLists_files.cmake PlotTemplateCommands/CMakeLists_files.cmake
FractureCommands/CMakeLists_files.cmake FractureCommands/CMakeLists_files.cmake)
)
# Include source file lists from *.cmake files # Include source file lists from *.cmake files
foreach (referencedfile ${COMMAND_REFERENCED_CMAKE_FILES}) foreach(referencedfile ${COMMAND_REFERENCED_CMAKE_FILES})
include (${referencedfile}) include(${referencedfile})
endforeach (referencedfile) endforeach(referencedfile)
find_package(Eigen3 REQUIRED) find_package(Eigen3 REQUIRED)
# Prefix files with COMMAND_ to avoid clash with application global lists # Prefix files with COMMAND_ to avoid clash with application global lists
qt5_wrap_cpp(COMMAND_MOC_SOURCE_FILES ${COMMAND_QT_MOC_HEADERS} ) qt5_wrap_cpp(COMMAND_MOC_SOURCE_FILES ${COMMAND_QT_MOC_HEADERS})
add_library( ${PROJECT_NAME} OBJECT add_library(
${COMMAND_CODE_SOURCE_FILES} ${PROJECT_NAME} OBJECT
${COMMAND_CODE_HEADER_FILES} ${COMMAND_CODE_SOURCE_FILES} ${COMMAND_CODE_HEADER_FILES}
${COMMAND_MOC_SOURCE_FILES} ${COMMAND_MOC_SOURCE_FILES})
)
target_include_directories(${PROJECT_NAME} target_include_directories(
PUBLIC ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/ThirdParty)
${CMAKE_SOURCE_DIR}/ThirdParty
)
# Before cmake 3.12 OBJECT libraries could not use the target_link_libraries command, # Before cmake 3.12 OBJECT libraries could not use the target_link_libraries
# So we need to set the POSITION_INDEPENDENT_CODE option manually # command, So we need to set the POSITION_INDEPENDENT_CODE option manually
set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
# Use this code when 3.12 can be used as minimum version of cmake # Use this code when 3.12 can be used as minimum version of cmake
set( LINK_LIBRARIES set(LINK_LIBRARIES
LibCore LibCore
cafCommand cafCommand
cafPdmCvf cafPdmCvf
cafPdmScripting cafPdmScripting
cafTensor cafTensor
cafViewer cafViewer
cafVizExtensions cafVizExtensions
ecl ecl
nightcharts nightcharts
qwt qwt
${QT_LIBRARIES}
Eigen3::Eigen)
${QT_LIBRARIES} target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES})
Eigen3::Eigen
)
target_link_libraries( ${PROJECT_NAME}
${LINK_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

221
ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt
View File

@@ -1,129 +1,116 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (RigGeoMechDataModel) project(RigGeoMechDataModel)
# Unity Build # Unity Build
if (RESINSIGHT_ENABLE_UNITY_BUILD) if(RESINSIGHT_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
add_library( ${PROJECT_NAME} add_library(
RigFemPart.h ${PROJECT_NAME}
RigFemPart.cpp RigFemPart.h
RigFemTypes.h RigFemPart.cpp
RigFemTypes.cpp RigFemTypes.h
RigGeoMechCaseData.cpp RigFemTypes.cpp
RigGeoMechCaseData.h RigGeoMechCaseData.cpp
RigFemPartCollection.cpp RigGeoMechCaseData.h
RigFemPartCollection.h RigFemPartCollection.cpp
RigFemPartResults.h RigFemPartCollection.h
RigFemPartResults.cpp RigFemPartResults.h
RigFemPartResultsCollection.h RigFemPartResults.cpp
RigFemPartResultsCollection.cpp RigFemPartResultsCollection.h
RigFemScalarResultFrames.h RigFemPartResultsCollection.cpp
RigFemScalarResultFrames.cpp RigFemScalarResultFrames.h
RigFemClosestResultIndexCalculator.h RigFemScalarResultFrames.cpp
RigFemClosestResultIndexCalculator.cpp RigFemClosestResultIndexCalculator.h
RigFemNativeStatCalc.h RigFemClosestResultIndexCalculator.cpp
RigFemNativeStatCalc.cpp RigFemNativeStatCalc.h
RigFemNativeVisibleCellsStatCalc.h RigFemNativeStatCalc.cpp
RigFemNativeVisibleCellsStatCalc.cpp RigFemNativeVisibleCellsStatCalc.h
RigFemFaceComparator.h RigFemNativeVisibleCellsStatCalc.cpp
RigFemPartGrid.h RigFemFaceComparator.h
RigFemPartGrid.cpp RigFemPartGrid.h
RigFemResultAddress.h RigFemPartGrid.cpp
RigFemResultPosEnum.h RigFemResultAddress.h
RimFemResultObserver.h RigFemResultPosEnum.h
RimFemResultObserver.cpp RimFemResultObserver.h
RigHexGradientTools.h RimFemResultObserver.cpp
RigHexGradientTools.cpp RigHexGradientTools.h
RigFemPartResultCalculator.h RigHexGradientTools.cpp
RigFemPartResultCalculator.cpp RigFemPartResultCalculator.h
RigFemPartResultCalculatorNormalSE.h RigFemPartResultCalculator.cpp
RigFemPartResultCalculatorNormalSE.cpp RigFemPartResultCalculatorNormalSE.h
RigFemPartResultCalculatorShearSE.h RigFemPartResultCalculatorNormalSE.cpp
RigFemPartResultCalculatorShearSE.cpp RigFemPartResultCalculatorShearSE.h
RigFemPartResultCalculatorNormalST.h RigFemPartResultCalculatorShearSE.cpp
RigFemPartResultCalculatorNormalST.cpp RigFemPartResultCalculatorNormalST.h
RigFemPartResultCalculatorShearST.h RigFemPartResultCalculatorNormalST.cpp
RigFemPartResultCalculatorShearST.cpp RigFemPartResultCalculatorShearST.h
RigFemPartResultCalculatorTimeLapse.h RigFemPartResultCalculatorShearST.cpp
RigFemPartResultCalculatorTimeLapse.cpp RigFemPartResultCalculatorTimeLapse.h
RigFemPartResultCalculatorGamma.h RigFemPartResultCalculatorTimeLapse.cpp
RigFemPartResultCalculatorGamma.cpp RigFemPartResultCalculatorGamma.h
RigFemPartResultCalculatorNormalized.h RigFemPartResultCalculatorGamma.cpp
RigFemPartResultCalculatorNormalized.cpp RigFemPartResultCalculatorNormalized.h
RigFemPartResultCalculatorSurfaceAngles.h RigFemPartResultCalculatorNormalized.cpp
RigFemPartResultCalculatorSurfaceAngles.cpp RigFemPartResultCalculatorSurfaceAngles.h
RigFemPartResultCalculatorSurfaceAlignedStress.h RigFemPartResultCalculatorSurfaceAngles.cpp
RigFemPartResultCalculatorSurfaceAlignedStress.cpp RigFemPartResultCalculatorSurfaceAlignedStress.h
RigFemPartResultCalculatorPrincipalStrain.h RigFemPartResultCalculatorSurfaceAlignedStress.cpp
RigFemPartResultCalculatorPrincipalStrain.cpp RigFemPartResultCalculatorPrincipalStrain.h
RigFemPartResultCalculatorPrincipalStress.h RigFemPartResultCalculatorPrincipalStrain.cpp
RigFemPartResultCalculatorPrincipalStress.cpp RigFemPartResultCalculatorPrincipalStress.h
RigFemPartResultCalculatorSFI.h RigFemPartResultCalculatorPrincipalStress.cpp
RigFemPartResultCalculatorSFI.cpp RigFemPartResultCalculatorSFI.h
RigFemPartResultCalculatorDSM.h RigFemPartResultCalculatorSFI.cpp
RigFemPartResultCalculatorDSM.cpp RigFemPartResultCalculatorDSM.h
RigFemPartResultCalculatorFOS.h RigFemPartResultCalculatorDSM.cpp
RigFemPartResultCalculatorFOS.cpp RigFemPartResultCalculatorFOS.h
RigFemPartResultCalculatorED.h RigFemPartResultCalculatorFOS.cpp
RigFemPartResultCalculatorED.cpp RigFemPartResultCalculatorED.h
RigFemPartResultCalculatorEV.h RigFemPartResultCalculatorED.cpp
RigFemPartResultCalculatorEV.cpp RigFemPartResultCalculatorEV.h
RigFemPartResultCalculatorQ.h RigFemPartResultCalculatorEV.cpp
RigFemPartResultCalculatorQ.cpp RigFemPartResultCalculatorQ.h
RigFemPartResultCalculatorSM.h RigFemPartResultCalculatorQ.cpp
RigFemPartResultCalculatorSM.cpp RigFemPartResultCalculatorSM.h
RigFemPartResultCalculatorCompaction.h RigFemPartResultCalculatorSM.cpp
RigFemPartResultCalculatorCompaction.cpp RigFemPartResultCalculatorCompaction.h
RigFemPartResultCalculatorStressGradients.h RigFemPartResultCalculatorCompaction.cpp
RigFemPartResultCalculatorStressGradients.cpp RigFemPartResultCalculatorStressGradients.h
RigFemPartResultCalculatorNE.h RigFemPartResultCalculatorStressGradients.cpp
RigFemPartResultCalculatorNE.cpp RigFemPartResultCalculatorNE.h
RigFemPartResultCalculatorFormationIndices.h RigFemPartResultCalculatorNE.cpp
RigFemPartResultCalculatorFormationIndices.cpp RigFemPartResultCalculatorFormationIndices.h
RigFemPartResultCalculatorBarConverted.h RigFemPartResultCalculatorFormationIndices.cpp
RigFemPartResultCalculatorBarConverted.cpp RigFemPartResultCalculatorBarConverted.h
RigFemPartResultCalculatorEnIpPorBar.h RigFemPartResultCalculatorBarConverted.cpp
RigFemPartResultCalculatorEnIpPorBar.cpp RigFemPartResultCalculatorEnIpPorBar.h
RigFemPartResultCalculatorNodalGradients.h RigFemPartResultCalculatorEnIpPorBar.cpp
RigFemPartResultCalculatorNodalGradients.cpp RigFemPartResultCalculatorNodalGradients.h
RigFemPartResultCalculatorStressAnisotropy.h RigFemPartResultCalculatorNodalGradients.cpp
RigFemPartResultCalculatorStressAnisotropy.cpp RigFemPartResultCalculatorStressAnisotropy.h
RigFemPartResultCalculatorPoreCompressibility.h RigFemPartResultCalculatorStressAnisotropy.cpp
RigFemPartResultCalculatorPoreCompressibility.cpp RigFemPartResultCalculatorPoreCompressibility.h
RigFemPartResultCalculatorPorosityPermeability.h RigFemPartResultCalculatorPoreCompressibility.cpp
RigFemPartResultCalculatorPorosityPermeability.cpp RigFemPartResultCalculatorPorosityPermeability.h
RigFemPartResultCalculatorInitialPorosity.h RigFemPartResultCalculatorPorosityPermeability.cpp
RigFemPartResultCalculatorInitialPorosity.cpp RigFemPartResultCalculatorInitialPorosity.h
RigFemPartResultCalculatorMudWeightWindow.h RigFemPartResultCalculatorInitialPorosity.cpp
RigFemPartResultCalculatorMudWeightWindow.cpp RigFemPartResultCalculatorMudWeightWindow.h
RigFemPartResultCalculatorShearSlipIndicator.h RigFemPartResultCalculatorMudWeightWindow.cpp
RigFemPartResultCalculatorShearSlipIndicator.cpp RigFemPartResultCalculatorShearSlipIndicator.h
RimGeoMechGeometrySelectionItem.h RigFemPartResultCalculatorShearSlipIndicator.cpp
RimGeoMechGeometrySelectionItem.cpp RimGeoMechGeometrySelectionItem.h
) RimGeoMechGeometrySelectionItem.cpp)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
set( LINK_LIBRARIES set(LINK_LIBRARIES LibCore cafPdmCvf cafTensor cafUserInterface CommonCode
LibCore ResultStatisticsCache)
cafPdmCvf
cafTensor
cafUserInterface
CommonCode
ResultStatisticsCache target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES})
)
target_link_libraries( ${PROJECT_NAME}
${LINK_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

156
ApplicationCode/GeoMech/OdbReader/CMakeLists.txt
View File

@@ -1,100 +1,94 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (RifOdbReader) project(RifOdbReader)
# Unity Build # Unity Build
if (RESINSIGHT_ENABLE_UNITY_BUILD) if(RESINSIGHT_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
if (MSVC) if(MSVC)
add_definitions(-DHKS_NT) add_definitions(-DHKS_NT)
add_definitions(-DABQ_WIN86_64) add_definitions(-DABQ_WIN86_64)
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -w -Wno-deprecated") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -w -Wno-deprecated")
add_definitions(-DTYPENAME=typename) add_definitions(-DTYPENAME=typename)
add_definitions(-D_LINUX_SOURCE) add_definitions(-D_LINUX_SOURCE)
add_definitions(-DABQ_LINUX) add_definitions(-DABQ_LINUX)
add_definitions(-DABQ_LNX86_64) add_definitions(-DABQ_LNX86_64)
add_definitions(-DSMA_GNUC) add_definitions(-DSMA_GNUC)
add_definitions(-DFOR_TRAIL) add_definitions(-DFOR_TRAIL)
add_definitions(-DHAS_BOOL) add_definitions(-DHAS_BOOL)
add_definitions(-DASSERT_ENABLED) add_definitions(-DASSERT_ENABLED)
add_definitions(-D_BSD_TYPES) add_definitions(-D_BSD_TYPES)
add_definitions(-D_BSD_SOURCE) add_definitions(-D_BSD_SOURCE)
add_definitions(-D_GNU_SOURCE) add_definitions(-D_GNU_SOURCE)
add_definitions(-D_POSIX_SOURCE) add_definitions(-D_POSIX_SOURCE)
add_definitions(-D_XOPEN_SOURCE_EXTENDED) add_definitions(-D_XOPEN_SOURCE_EXTENDED)
add_definitions(-D_XOPEN_SOURCE) add_definitions(-D_XOPEN_SOURCE)
add_definitions(-DHAVE_OPENGL) add_definitions(-DHAVE_OPENGL)
add_definitions(-DHKS_OPEN_GL) add_definitions(-DHKS_OPEN_GL)
add_definitions(-DGL_GLEXT_PROTOTYPES) add_definitions(-DGL_GLEXT_PROTOTYPES)
add_definitions(-DMULTI_THREADING_ENABLED) add_definitions(-DMULTI_THREADING_ENABLED)
add_definitions(-D_REENTRANT) add_definitions(-D_REENTRANT)
add_definitions(-DABQ_MPI_SUPPORT) add_definitions(-DABQ_MPI_SUPPORT)
add_definitions(-DBIT64) add_definitions(-DBIT64)
add_definitions(-D_LARGEFILE64_SOURCE) add_definitions(-D_LARGEFILE64_SOURCE)
add_definitions(-D_FILE_OFFSET_BITS=64) add_definitions(-D_FILE_OFFSET_BITS=64)
add_definitions(-DABQ_MPI_PMPI) add_definitions(-DABQ_MPI_PMPI)
endif(MSVC) endif(MSVC)
include_directories( include_directories(${RESINSIGHT_ODB_API_DIR}/include)
${RESINSIGHT_ODB_API_DIR}/include
)
add_library( ${PROJECT_NAME} add_library(
RifOdbReader.h ${PROJECT_NAME} RifOdbReader.h RifOdbReader.cpp RifGeoMechReaderInterface.h
RifOdbReader.cpp RifGeoMechReaderInterface.cpp OdbSetup.cmake)
RifGeoMechReaderInterface.h
RifGeoMechReaderInterface.cpp
OdbSetup.cmake
)
if (MSVC) if(MSVC)
list(APPEND RI_ODB_LIBS list(
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbDdbOdb.lib APPEND
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbApi.lib RI_ODB_LIBS
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCore.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbDdbOdb.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCoreGeom.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbApi.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbAttrEO.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCore.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAAbuBasicUtils.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCoreGeom.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasShared.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbAttrEO.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasCoreUtils.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAAbuBasicUtils.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAStiCAE_StableTime.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasShared.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasMem.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasCoreUtils.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAAbuGeom.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAStiCAE_StableTime.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMARomDiagEx.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMABasMem.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASspUmaCore.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAAbuGeom.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASimInterface.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMARomDiagEx.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAMtxCoreModule.lib ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASspUmaCore.lib
) ${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASimInterface.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAMtxCoreModule.lib)
else() else()
list(APPEND RI_ODB_LIBS list(
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbDdbOdb.so APPEND
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbApi.so RI_ODB_LIBS
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbCore.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbDdbOdb.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbCoreGeom.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbApi.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbAttrEO.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbCore.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAAbuBasicUtils.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbCoreGeom.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMABasShared.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbAttrEO.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMABasCoreUtils.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAAbuBasicUtils.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAStiCAE_StableTime.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMABasShared.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMABasMem.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMABasCoreUtils.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAAbuGeom.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAStiCAE_StableTime.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMARomDiagEx.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMABasMem.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASspUmaCore.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAAbuGeom.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASimInterface.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMARomDiagEx.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAMtxCoreModule.so ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASspUmaCore.so
) ${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASimInterface.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAMtxCoreModule.so)
endif(MSVC) endif(MSVC)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel LibCore) target_link_libraries(${PROJECT_NAME} ${RI_ODB_LIBS} RigGeoMechDataModel
LibCore)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

31
ApplicationCode/GeoMech/OdbReader_UnitTests/CMakeLists.txt
View File

@@ -1,10 +1,16 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project ( OdbReader_UnitTests ) project(OdbReader_UnitTests)
set(RI_VIZ_FWK_ROOT ../../../Fwk/VizFwk CACHE PATH "Path to VizFwk") set(RI_VIZ_FWK_ROOT
set(RI_GTEST_ROOT ../../../ThirdParty CACHE PATH "Path to folder containing gtest folder") ../../../Fwk/VizFwk
set(RI_TEST_FILE "" CACHE FILEPATH "Path to test file") CACHE PATH "Path to VizFwk")
set(RI_GTEST_ROOT
../../../ThirdParty
CACHE PATH "Path to folder containing gtest folder")
set(RI_TEST_FILE
""
CACHE FILEPATH "Path to test file")
include(${RI_VIZ_FWK_ROOT}/CMake/Utils/ceeDetermineCompilerFlags.cmake) include(${RI_VIZ_FWK_ROOT}/CMake/Utils/ceeDetermineCompilerFlags.cmake)
@@ -13,7 +19,7 @@ add_subdirectory(../../ResultStatisticsCache buildResultStatisticsCache)
add_subdirectory(../OdbReader buildOdbReader) add_subdirectory(../OdbReader buildOdbReader)
add_subdirectory(../GeoMechDataModel buildGeoMechDataModel) add_subdirectory(../GeoMechDataModel buildGeoMechDataModel)
add_definitions( -DTEST_FILE="${RI_TEST_FILE}") add_definitions(-DTEST_FILE="${RI_TEST_FILE}")
include_directories(${RI_VIZ_FWK_ROOT}/LibCore) include_directories(${RI_VIZ_FWK_ROOT}/LibCore)
include_directories(../../ResultStatisticsCache) include_directories(../../ResultStatisticsCache)
@@ -22,13 +28,10 @@ include_directories(../OdbReader)
include_directories(../GeoMechDataModel) include_directories(../GeoMechDataModel)
include_directories(${RI_GTEST_ROOT}) include_directories(${RI_GTEST_ROOT})
set( UNIT_TEST_CPP_SOURCES set(UNIT_TEST_CPP_SOURCES main.cpp RifOdbReader-Test.cpp
main.cpp ${RI_GTEST_ROOT}/gtest/gtest-all.cc)
RifOdbReader-Test.cpp
${RI_GTEST_ROOT}/gtest/gtest-all.cc
)
add_executable( ${PROJECT_NAME} ${UNIT_TEST_CPP_SOURCES} ) add_executable(${PROJECT_NAME} ${UNIT_TEST_CPP_SOURCES})
target_link_libraries( ${PROJECT_NAME} RifOdbReader) target_link_libraries(${PROJECT_NAME} RifOdbReader)
include(../OdbReader/OdbSetup.cmake) include(../OdbReader/OdbSetup.cmake)

371
ApplicationCode/GrpcInterface/CMakeLists.txt
View File

@@ -1,24 +1,29 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (GrpcInterface) project(GrpcInterface)
message(STATUS "GRPC enabled") message(STATUS "GRPC enabled")
add_definitions(-DENABLE_GRPC) add_definitions(-DENABLE_GRPC)
if (VCPKG_AUTO_INSTALL) if(VCPKG_AUTO_INSTALL)
vcpkg_install(grpc) vcpkg_install(grpc)
endif() endif()
set(CMAKE_UNITY_BUILD false) set(CMAKE_UNITY_BUILD false)
set(RESINSIGHT_GRPC_PYTHON_EXECUTABLE "" CACHE FILEPATH "gRPC : Path to Python 3 executable, required to build the Python client library") set(RESINSIGHT_GRPC_PYTHON_EXECUTABLE
""
CACHE
FILEPATH
"gRPC : Path to Python 3 executable, required to build the Python client library"
)
if (MSVC) if(MSVC)
add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_WIN32_WINNT=0x600)
endif() endif()
add_definitions(-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING) add_definitions(-D_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
set ( SOURCE_GROUP_HEADER_FILES set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcServer.h ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcServer.h
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcHelper.h ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcHelper.h
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcCallbacks.h ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcCallbacks.h
@@ -32,10 +37,9 @@ set ( SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcAppService.h ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcAppService.h
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPropertiesService.h ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPropertiesService.h
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcNNCPropertiesService.h ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcNNCPropertiesService.h
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPdmObjectService.h ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPdmObjectService.h)
)
set ( SOURCE_GROUP_SOURCE_FILES set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcServer.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcServer.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcHelper.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcHelper.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcServiceInterface.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcServiceInterface.cpp
@@ -47,21 +51,22 @@ set ( SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcAppService.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcAppService.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPropertiesService.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPropertiesService.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcNNCPropertiesService.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcNNCPropertiesService.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPdmObjectService.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPdmObjectService.cpp)
)
# Find Protobuf installation # Find Protobuf installation Looks for protobuf-config.cmake file installed by
# Looks for protobuf-config.cmake file installed by Protobuf's cmake installation. # Protobuf's cmake installation.
set(protobuf_MODULE_COMPATIBLE ON) set(protobuf_MODULE_COMPATIBLE ON)
find_package(Protobuf CONFIG 3.0 QUIET) find_package(Protobuf CONFIG 3.0 QUIET)
if (Protobuf_FOUND) if(Protobuf_FOUND)
message(STATUS "Using protobuf ${protobuf_VERSION}") message(STATUS "Using protobuf ${protobuf_VERSION}")
else() else()
message(FATAL_ERROR "Protocol Buffers not found. This is required to build with gRPC") message(
FATAL_ERROR
"Protocol Buffers not found. This is required to build with gRPC")
endif() endif()
# Find gRPC installation # Find gRPC installation Looks for gRPCConfig.cmake file installed by gRPC's
# Looks for gRPCConfig.cmake file installed by gRPC's cmake installation. # cmake installation.
find_package(gRPC CONFIG REQUIRED) find_package(gRPC CONFIG REQUIRED)
message(STATUS "Using gRPC ${gRPC_VERSION}") message(STATUS "Using gRPC ${gRPC_VERSION}")
@@ -72,25 +77,23 @@ set(_GRPC_GRPCPP_UNSECURE gRPC::grpc++_unsecure gRPC::grpc_unsecure gRPC::gpr)
set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:gRPC::grpc_cpp_plugin>) set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
set(GRPC_LIBRARIES ${_GRPC_GRPCPP_UNSECURE} ${_PROTOBUF_LIBPROTOBUF}) set(GRPC_LIBRARIES ${_GRPC_GRPCPP_UNSECURE} ${_PROTOBUF_LIBPROTOBUF})
set_target_properties(${GRPC_LIBRARIES} PROPERTIES set_target_properties(
MAP_IMPORTED_CONFIG_MINSIZEREL RELEASE ${GRPC_LIBRARIES} PROPERTIES MAP_IMPORTED_CONFIG_MINSIZEREL RELEASE
MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)
)
set( LINK_LIBRARIES set(LINK_LIBRARIES
${QT_LIBRARIES} ${QT_LIBRARIES}
${GRPC_LIBRARIES} ${GRPC_LIBRARIES}
LibCore LibCore
cafCommand cafCommand
cafPdmCvf cafPdmCvf
cafPdmScripting cafPdmScripting
cafTensor cafTensor
cafViewer cafViewer
cafVizExtensions cafVizExtensions
ecl ecl
nightcharts nightcharts
qwt qwt)
)
# Proto files # Proto files
set(PROTO_FILES set(PROTO_FILES
@@ -103,194 +106,198 @@ set(PROTO_FILES
"NNCProperties" "NNCProperties"
"App" "App"
"Properties" "Properties"
"Grid" "Grid")
)
set(GRPC_PYTHON_SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}/Python") set(GRPC_PYTHON_SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}/Python")
add_custom_target(PipInstall) add_custom_target(PipInstall)
foreach(proto_file ${PROTO_FILES}) foreach(proto_file ${PROTO_FILES})
get_filename_component(rips_proto "${CMAKE_CURRENT_LIST_DIR}/GrpcProtos/${proto_file}.proto" ABSOLUTE) get_filename_component(
get_filename_component(rips_proto_path "${rips_proto}" PATH) rips_proto "${CMAKE_CURRENT_LIST_DIR}/GrpcProtos/${proto_file}.proto"
ABSOLUTE)
get_filename_component(rips_proto_path "${rips_proto}" PATH)
list(APPEND GRPC_PROTO_FILES_FULL_PATH ${rips_proto}) list(APPEND GRPC_PROTO_FILES_FULL_PATH ${rips_proto})
set(rips_proto_srcs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.pb.cc") set(rips_proto_srcs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.pb.cc")
set(rips_proto_hdrs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.pb.h") set(rips_proto_hdrs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.pb.h")
set(rips_grpc_srcs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.grpc.pb.cc") set(rips_grpc_srcs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.grpc.pb.cc")
set(rips_grpc_hdrs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.grpc.pb.h") set(rips_grpc_hdrs "${CMAKE_BINARY_DIR}/Generated/${proto_file}.grpc.pb.h")
add_custom_command(
OUTPUT "${rips_proto_srcs}" "${rips_proto_hdrs}" "${rips_grpc_srcs}"
"${rips_grpc_hdrs}"
COMMAND
${_PROTOBUF_PROTOC} ARGS --grpc_out "${CMAKE_BINARY_DIR}/Generated"
--cpp_out "${CMAKE_BINARY_DIR}/Generated" -I "${rips_proto_path}"
--plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}" "${rips_proto}"
DEPENDS "${rips_proto}")
set(rips_proto_python "rips/generated/${proto_file}_pb2.py")
set(rips_grpc_python "rips/generated/${proto_file}_pb2_grpc.py")
if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
message(
STATUS "Using Python Executable: ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE}")
add_custom_command( add_custom_command(
OUTPUT "${rips_proto_srcs}" "${rips_proto_hdrs}" "${rips_grpc_srcs}" "${rips_grpc_hdrs}" OUTPUT "${GRPC_PYTHON_SOURCE_PATH}/${rips_proto_python}"
COMMAND ${_PROTOBUF_PROTOC} "${GRPC_PYTHON_SOURCE_PATH}/${rips_grpc_python}"
ARGS --grpc_out "${CMAKE_BINARY_DIR}/Generated" COMMAND
--cpp_out "${CMAKE_BINARY_DIR}/Generated" ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m grpc_tools.protoc -I
-I "${rips_proto_path}" "${rips_proto_path}" --python_out
--plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}" "${GRPC_PYTHON_SOURCE_PATH}/rips/generated" --grpc_python_out
"${rips_proto}" "${GRPC_PYTHON_SOURCE_PATH}/rips/generated" "${rips_proto}"
DEPENDS "${rips_proto}" DEPENDS "${rips_proto}"
COMMENT "Generating ${rips_proto_python} and ${rips_grpc_python}"
VERBATIM)
list(APPEND GRPC_PYTHON_GENERATED_SOURCES ${rips_proto_python}
${rips_grpc_python})
else()
message(
STATUS
"RESINSIGHT_GRPC_PYTHON_EXECUTABLE not specified. Will not install Python client code"
) )
endif()
set(rips_proto_python "rips/generated/${proto_file}_pb2.py")
set(rips_grpc_python "rips/generated/${proto_file}_pb2_grpc.py")
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE) list(APPEND GRPC_HEADER_FILES ${rips_proto_hdrs} ${rips_grpc_hdrs})
message(STATUS "Using Python Executable: ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE}")
add_custom_command(
OUTPUT "${GRPC_PYTHON_SOURCE_PATH}/${rips_proto_python}" "${GRPC_PYTHON_SOURCE_PATH}/${rips_grpc_python}"
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE}
ARGS -m grpc_tools.protoc
-I "${rips_proto_path}"
--python_out "${GRPC_PYTHON_SOURCE_PATH}/rips/generated"
--grpc_python_out "${GRPC_PYTHON_SOURCE_PATH}/rips/generated"
"${rips_proto}"
DEPENDS "${rips_proto}"
COMMENT "Generating ${rips_proto_python} and ${rips_grpc_python}"
VERBATIM
)
list (APPEND GRPC_PYTHON_GENERATED_SOURCES
${rips_proto_python}
${rips_grpc_python}
)
else()
message(STATUS "RESINSIGHT_GRPC_PYTHON_EXECUTABLE not specified. Will not install Python client code")
endif()
list( APPEND GRPC_HEADER_FILES list(APPEND GRPC_CPP_SOURCES ${rips_proto_srcs} ${rips_grpc_srcs})
${rips_proto_hdrs}
${rips_grpc_hdrs}
)
list( APPEND GRPC_CPP_SOURCES
${rips_proto_srcs}
${rips_grpc_srcs}
)
endforeach(proto_file) endforeach(proto_file)
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE) if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.py.cmake configure_file(${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.py.cmake
${GRPC_PYTHON_SOURCE_PATH}/rips/generated/RiaVersionInfo.py) ${GRPC_PYTHON_SOURCE_PATH}/rips/generated/RiaVersionInfo.py)
CONFIGURE_FILE( ${GRPC_PYTHON_SOURCE_PATH}/setup.py.cmake configure_file(${GRPC_PYTHON_SOURCE_PATH}/setup.py.cmake
${GRPC_PYTHON_SOURCE_PATH}/setup.py) ${GRPC_PYTHON_SOURCE_PATH}/setup.py)
endif() endif()
list(APPEND GRPC_PYTHON_SOURCES list(
"rips/generated/RiaVersionInfo.py" APPEND
"rips/__init__.py" GRPC_PYTHON_SOURCES
"rips/case.py" "rips/generated/RiaVersionInfo.py"
"rips/contour_map.py" "rips/__init__.py"
"rips/grid.py" "rips/case.py"
"rips/gridcasegroup.py" "rips/contour_map.py"
"rips/instance.py" "rips/grid.py"
"rips/pdmobject.py" "rips/gridcasegroup.py"
"rips/plot.py" "rips/instance.py"
"rips/project.py" "rips/pdmobject.py"
"rips/simulation_well.py" "rips/plot.py"
"rips/view.py" "rips/project.py"
"rips/well_log_plot.py" "rips/simulation_well.py"
"rips/PythonExamples/instance_example.py" "rips/view.py"
"rips/PythonExamples/command_example.py" "rips/well_log_plot.py"
"rips/PythonExamples/case_grid_group.py" "rips/PythonExamples/instance_example.py"
"rips/PythonExamples/case_info_streaming_example.py" "rips/PythonExamples/command_example.py"
"rips/PythonExamples/create_wbs_plot.py" "rips/PythonExamples/case_grid_group.py"
"rips/PythonExamples/export_plots.py" "rips/PythonExamples/case_info_streaming_example.py"
"rips/PythonExamples/export_snapshots.py" "rips/PythonExamples/create_wbs_plot.py"
"rips/PythonExamples/error_handling.py" "rips/PythonExamples/export_plots.py"
"rips/PythonExamples/import_well_paths_and_logs.py" "rips/PythonExamples/export_snapshots.py"
"rips/PythonExamples/soil_porv_async.py" "rips/PythonExamples/error_handling.py"
"rips/PythonExamples/soil_porv_sync.py" "rips/PythonExamples/import_well_paths_and_logs.py"
"rips/PythonExamples/selected_cases.py" "rips/PythonExamples/soil_porv_async.py"
"rips/PythonExamples/all_cases.py" "rips/PythonExamples/soil_porv_sync.py"
"rips/PythonExamples/replace_case.py" "rips/PythonExamples/selected_cases.py"
"rips/PythonExamples/set_grid_properties.py" "rips/PythonExamples/all_cases.py"
"rips/PythonExamples/set_cell_result.py" "rips/PythonExamples/replace_case.py"
"rips/PythonExamples/set_flow_diagnostics_result.py" "rips/PythonExamples/set_grid_properties.py"
"rips/PythonExamples/grid_information.py" "rips/PythonExamples/set_cell_result.py"
"rips/PythonExamples/input_prop_test_sync.py" "rips/PythonExamples/set_flow_diagnostics_result.py"
"rips/PythonExamples/input_prop_test_async.py" "rips/PythonExamples/grid_information.py"
"rips/PythonExamples/soil_average_async.py" "rips/PythonExamples/input_prop_test_sync.py"
"rips/PythonExamples/soil_average_sync.py" "rips/PythonExamples/input_prop_test_async.py"
"rips/PythonExamples/view_example.py" "rips/PythonExamples/soil_average_async.py"
"rips/tests/test_cases.py" "rips/PythonExamples/soil_average_sync.py"
"rips/tests/test_grids.py" "rips/PythonExamples/view_example.py"
"rips/tests/test_properties.py" "rips/tests/test_cases.py"
"rips/tests/test_project.py" "rips/tests/test_grids.py"
"rips/tests/conftest.py" "rips/tests/test_properties.py"
"rips/tests/dataroot.py" "rips/tests/test_project.py"
"rips/tests/test_nnc_properties.py" "rips/tests/conftest.py"
"rips/tests/test_simulation_wells.py" "rips/tests/dataroot.py"
"rips/tests/test_summary_cases.py" "rips/tests/test_nnc_properties.py"
"rips/tests/test_wells.py" "rips/tests/test_simulation_wells.py"
"requirements.txt" "rips/tests/test_summary_cases.py"
"setup.py" "rips/tests/test_wells.py"
"README.md" "requirements.txt"
"LICENSE" "setup.py"
) "README.md"
"LICENSE")
list(APPEND GRPC_PYTHON_SOURCES ${GRPC_PYTHON_GENERATED_SOURCES}) list(APPEND GRPC_PYTHON_SOURCES ${GRPC_PYTHON_GENERATED_SOURCES})
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE) if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
foreach(PYTHON_SCRIPT ${GRPC_PYTHON_SOURCES}) foreach(PYTHON_SCRIPT ${GRPC_PYTHON_SOURCES})
list(APPEND GRPC_PYTHON_SOURCES_FULL_PATH "${GRPC_PYTHON_SOURCE_PATH}/${PYTHON_SCRIPT}") list(APPEND GRPC_PYTHON_SOURCES_FULL_PATH
endforeach() "${GRPC_PYTHON_SOURCE_PATH}/${PYTHON_SCRIPT}")
endforeach()
endif() endif()
add_library( ${PROJECT_NAME} OBJECT add_library(
${SOURCE_GROUP_HEADER_FILES} ${PROJECT_NAME} OBJECT
${SOURCE_GROUP_SOURCE_FILES} ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
${GRPC_HEADER_FILES} ${GRPC_HEADER_FILES} ${GRPC_CPP_SOURCES})
${GRPC_CPP_SOURCES}
)
target_link_libraries( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES})
${LINK_LIBRARIES}
)
if (MSVC) if(MSVC)
# GRPC generates a lot of harmless warnings on MSVC # GRPC generates a lot of harmless warnings on MSVC
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4251 /wd4702 /wd4005 /wd4244 /wd4125 /wd4267") set_target_properties(
${PROJECT_NAME}
PROPERTIES COMPILE_FLAGS "/wd4251 /wd4702 /wd4005 /wd4244 /wd4125 /wd4267")
else() else()
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-Wno-overloaded-virtual") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"-Wno-overloaded-virtual")
endif() endif()
# install gRPC Python files # install gRPC Python files
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE AND RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE) if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE AND RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE)
message(STATUS "Installing Python modules") message(STATUS "Installing Python modules")
add_custom_command( add_custom_command(
TARGET PipInstall TARGET PipInstall
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --upgrade pip COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --upgrade
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --user wheel setuptools pytest pip
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --user grpcio-tools COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --user
) wheel setuptools pytest
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --user
grpcio-tools)
endif() endif()
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE AND RESINSIGHT_GRPC_BUNDLE_PYTHON_MODULE) if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE AND RESINSIGHT_GRPC_BUNDLE_PYTHON_MODULE)
message(STATUS "Bundling Python GRPC modules") message(STATUS "Bundling Python GRPC modules")
add_custom_command( add_custom_command(
TARGET PipInstall TARGET PipInstall
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --user --target=${GRPC_PYTHON_SOURCE_PATH} grpcio-tools COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --user
) --target=${GRPC_PYTHON_SOURCE_PATH} grpcio-tools)
endif() endif()
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE) if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
add_custom_target(GeneratedPythonSources ALL DEPENDS ${GRPC_PYTHON_SOURCES_FULL_PATH}) add_custom_target(GeneratedPythonSources ALL
DEPENDS ${GRPC_PYTHON_SOURCES_FULL_PATH})
add_dependencies(${PROJECT_NAME} GeneratedPythonSources) add_dependencies(${PROJECT_NAME} GeneratedPythonSources)
if (RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE) if(RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE)
add_dependencies(${PROJECT_NAME} PipInstall) add_dependencies(${PROJECT_NAME} PipInstall)
add_dependencies(GeneratedPythonSources PipInstall) add_dependencies(GeneratedPythonSources PipInstall)
endif() endif()
endif() endif()
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE) if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
install(DIRECTORY ${GRPC_PYTHON_SOURCE_PATH}/ DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/Python) install(DIRECTORY ${GRPC_PYTHON_SOURCE_PATH}/
DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/Python)
endif() endif()
source_group( "GrpcInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.cmake ) source_group(
source_group( "GrpcInterface\\GrpcProtos" FILES ${GRPC_PROTO_FILES_FULL_PATH} ) "GrpcInterface"
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE) FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
source_group(TREE ${GRPC_PYTHON_SOURCE_PATH} FILES ${GRPC_PYTHON_SOURCES_FULL_PATH} PREFIX "GrpcInterface\\Python") ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.cmake)
source_group("GrpcInterface\\GrpcProtos" FILES ${GRPC_PROTO_FILES_FULL_PATH})
if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
source_group(
TREE ${GRPC_PYTHON_SOURCE_PATH}
FILES ${GRPC_PYTHON_SOURCES_FULL_PATH}
PREFIX "GrpcInterface\\Python")
endif() endif()

26
ApplicationCode/ResultStatisticsCache/CMakeLists.txt
View File

@@ -1,24 +1,16 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (ResultStatisticsCache) project(ResultStatisticsCache)
include_directories( include_directories(${LibCore_SOURCE_DIR})
${LibCore_SOURCE_DIR}
)
add_library( ${PROJECT_NAME} add_library(
RigStatisticsCalculator.h ${PROJECT_NAME}
RigStatisticsCalculator.cpp RigStatisticsCalculator.h RigStatisticsCalculator.cpp
RigStatisticsDataCache.h RigStatisticsDataCache.h RigStatisticsDataCache.cpp RigStatisticsMath.h
RigStatisticsDataCache.cpp RigStatisticsMath.cpp)
RigStatisticsMath.h
RigStatisticsMath.cpp
)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(${PROJECT_NAME} LibCore) target_link_libraries(${PROJECT_NAME} LibCore)

88
Fwk/AppFwk/CMakeLists.txt
View File

@@ -1,47 +1,51 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project (CeeApp) project(CeeApp)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code
# related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message("Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") message(
"Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
)
endif() endif()
# Qt # Qt
if (NOT DEFINED(CEE_USE_QT5)) if(NOT DEFINED (CEE_USE_QT5))
option(CEE_USE_QT5 "Use Qt5" ON) option(CEE_USE_QT5 "Use Qt5" ON)
endif(NOT DEFINED(CEE_USE_QT5)) endif(NOT DEFINED (CEE_USE_QT5))
if (CEE_USE_QT5) if(CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets) find_package(
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets) Qt5
COMPONENTS
REQUIRED Core Gui OpenGL Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else() else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED) find_package(
include(${QT_USE_FILE}) Qt4
COMPONENTS QtCore QtGui QtMain QtOpenGl
REQUIRED)
include(${QT_USE_FILE})
endif(CEE_USE_QT5) endif(CEE_USE_QT5)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_CXX_FLAGS "-std=c++0x") set(CMAKE_CXX_FLAGS "-std=c++0x")
endif()
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif() endif()
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif()
# Improvement Cmake 3.x # Improvement Cmake 3.x If we have compiler requirements for this library, list
# If we have compiler requirements for this library, list them # them target_compile_features(lib PUBLIC cxx_auto_type PRIVATE
#target_compile_features(lib # cxx_variadic_templates)
# PUBLIC cxx_auto_type
# PRIVATE cxx_variadic_templates)
# libraries
add_subdirectory(cafProjectDataModel/cafPdmCore)
#libraries add_subdirectory(cafProjectDataModel/cafPdmUiCore)
add_subdirectory (cafProjectDataModel/cafPdmCore) add_subdirectory(cafProjectDataModel/cafPdmXml)
add_subdirectory (cafProjectDataModel/cafPdmUiCore)
add_subdirectory (cafProjectDataModel/cafPdmXml)
add_subdirectory(cafProjectDataModel) add_subdirectory(cafProjectDataModel)
add_subdirectory(cafCommand) add_subdirectory(cafCommand)
@@ -49,22 +53,22 @@ add_subdirectory(cafCommandFeatures)
add_subdirectory(cafUserInterface) add_subdirectory(cafUserInterface)
add_subdirectory(cafPdmScripting) add_subdirectory(cafPdmScripting)
#executables # executables
add_subdirectory(cafTests/cafTestApplication) add_subdirectory(cafTests/cafTestApplication)
if( UNIX ) if(UNIX)
set(THREAD_LIBRARY "pthread") set(THREAD_LIBRARY "pthread")
endif() endif()
add_subdirectory (cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests) add_subdirectory(cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests)
add_subdirectory (cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests) add_subdirectory(cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests)
add_subdirectory (cafProjectDataModel/cafProjectDataModel_UnitTests) add_subdirectory(cafProjectDataModel/cafProjectDataModel_UnitTests)
add_subdirectory (cafUserInterface/cafUserInterface_UnitTests) add_subdirectory(cafUserInterface/cafUserInterface_UnitTests)
add_subdirectory (cafPdmScripting/cafPdmScripting_UnitTests) add_subdirectory(cafPdmScripting/cafPdmScripting_UnitTests)
# Organize sub-projects into folders on Visual Studio # Organize sub-projects into folders on Visual Studio Turn on using solution
# Turn on using solution folders # folders
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(TARGET cafPdmCore cafPdmCore_UnitTests cafPdmXml cafPdmXml_UnitTests cafPdmUiCore PROPERTY FOLDER "PdmCore") set_property(TARGET cafPdmCore cafPdmCore_UnitTests cafPdmXml
cafPdmXml_UnitTests cafPdmUiCore PROPERTY FOLDER "PdmCore")

109
Fwk/AppFwk/CommonCode/CMakeLists.txt
View File

@@ -1,77 +1,72 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (CommonCode) project(CommonCode)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# Open GL # Open GL
find_package( OpenGL ) find_package(OpenGL)
# Qt # Qt
# These headers need to go through Qt's MOC compiler # These headers need to go through Qt's MOC compiler
set( MOC_HEADER_FILES set(MOC_HEADER_FILES cafMessagePanel.h)
cafMessagePanel.h
)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_library( ${PROJECT_NAME} add_library(
cafEffectCache.cpp ${PROJECT_NAME}
cafEffectCache.h cafEffectCache.cpp
cafEffectGenerator.cpp cafEffectCache.h
cafEffectGenerator.h cafEffectGenerator.cpp
cafLog.cpp cafEffectGenerator.h
cafLog.h cafLog.cpp
cafMessagePanel.cpp cafLog.h
cafMessagePanel.h cafMessagePanel.cpp
cafMouseState.cpp cafMessagePanel.h
cafMouseState.h cafMouseState.cpp
cafUtils.cpp cafMouseState.h
cafUtils.h cafUtils.cpp
cvfStructGrid.cpp cafUtils.h
cvfStructGrid.h cvfStructGrid.cpp
cvfCellRange.cpp cvfStructGrid.h
cvfCellRange.h cvfCellRange.cpp
cafColorTable.cpp cvfCellRange.h
cafColorTable.h cafColorTable.cpp
cafContourLines.cpp cafColorTable.h
cafContourLines.h cafContourLines.cpp
cafContourLines.h
cvfStructGridGeometryGenerator.cpp cvfStructGridGeometryGenerator.cpp
cvfStructGridGeometryGenerator.h cvfStructGridGeometryGenerator.h
cvfStructGridScalarDataAccess.h cvfStructGridScalarDataAccess.h
cafVecIjk.cpp cafVecIjk.cpp
cafVecIjk.h cafVecIjk.h
${MOC_SOURCE_FILES})
${MOC_SOURCE_FILES} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
)
target_include_directories(${PROJECT_NAME} target_link_libraries(
PUBLIC ${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} LibCore
) LibGeometry
LibViewing
LibRender
LibGuiQt
cafPdmCore
${QT_LIBRARIES})
target_link_libraries ( ${PROJECT_NAME} if(MSVC)
LibCore set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
LibGeometry "/W4 /wd4100 /wd4127")
LibViewing endif()
LibRender
LibGuiQt
cafPdmCore
${QT_LIBRARIES}
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

66
Fwk/AppFwk/cafAnimControl/CMakeLists.txt
View File

@@ -1,62 +1,48 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafAnimControl) project(cafAnimControl)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# Qt # Qt
set( MOC_HEADER_FILES set(MOC_HEADER_FILES cafFrameAnimationControl.h cafAnimationToolBar.h
cafFrameAnimationControl.h cafPopupMenuButton.h)
cafAnimationToolBar.h
cafPopupMenuButton.h
)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent scope # NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent
# CMakeList.txt in the application folder (parent scope) must use the following syntax # scope CMakeList.txt in the application folder (parent scope) must use the
# to make sure the QRC_FILES variable contains appended files in subfolders # following syntax to make sure the QRC_FILES variable contains appended files
# in subfolders
# set( QRC_FILES # set( QRC_FILES ${QRC_FILES} Resources/MyaApplication.qrc )
# ${QRC_FILES}
# Resources/MyaApplication.qrc
# )
set( QRC_FILES set(QRC_FILES
${QRC_FILES} ${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafAnimControl.qrc
${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafAnimControl.qrc PARENT_SCOPE)
PARENT_SCOPE
)
set( PROJECT_FILES set(PROJECT_FILES
cafFrameAnimationControl.h cafFrameAnimationControl.h cafFrameAnimationControl.cpp
cafFrameAnimationControl.cpp cafAnimationToolBar.h cafAnimationToolBar.cpp cafPopupMenuButton.h
cafAnimationToolBar.h cafPopupMenuButton.cpp)
cafAnimationToolBar.cpp
cafPopupMenuButton.h
cafPopupMenuButton.cpp
)
add_library( ${PROJECT_NAME} add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
${PROJECT_FILES}
${MOC_SOURCE_FILES}
)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES}) target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
if (MSVC) if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4127") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4127")
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

50
Fwk/AppFwk/cafCommand/CMakeLists.txt
View File

@@ -1,66 +1,52 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafCommand) project(cafCommand)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# These headers need to go through Qt's MOC compiler # These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES set(MOC_HEADER_FILES cafCmdFeature.h cafCmdFeatureManager.h)
cafCmdFeature.h
cafCmdFeatureManager.h
)
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
set( PROJECT_FILES
set(PROJECT_FILES
cafCmdExecCommandManager.cpp cafCmdExecCommandManager.cpp
cafCmdExecCommandManager.h cafCmdExecCommandManager.h
cafCmdExecuteCommand.h cafCmdExecuteCommand.h
cafCmdUiCommandSystemImpl.h cafCmdUiCommandSystemImpl.h
cafCmdUiCommandSystemImpl.cpp cafCmdUiCommandSystemImpl.cpp
cafCmdFieldChangeExec.cpp cafCmdFieldChangeExec.cpp
cafCmdFieldChangeExec.h cafCmdFieldChangeExec.h
cafCmdSelectionHelper.cpp cafCmdSelectionHelper.cpp
cafCmdSelectionHelper.h cafCmdSelectionHelper.h
cafCmdSelectionChangeExec.cpp cafCmdSelectionChangeExec.cpp
cafCmdSelectionChangeExec.h cafCmdSelectionChangeExec.h
cafCmdFeature.cpp cafCmdFeature.cpp
cafCmdFeature.h cafCmdFeature.h
cafCmdFeatureManager.cpp cafCmdFeatureManager.cpp
cafCmdFeatureManager.h cafCmdFeatureManager.h
cafCmdFeatureMenuBuilder.cpp cafCmdFeatureMenuBuilder.cpp
cafCmdFeatureMenuBuilder.h cafCmdFeatureMenuBuilder.h)
)
add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
add_library( ${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
${PROJECT_FILES}
${MOC_SOURCE_FILES}
)
target_include_directories(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME} if(MSVC)
cafProjectDataModel set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
${QT_LIBRARIES} "/W4 /wd4100 /wd4127")
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

114
Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt
View File

@@ -1,25 +1,25 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafCommandFeatures) project(cafCommandFeatures)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# These headers need to go through Qt's MOC compiler # These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES set(MOC_HEADER_FILES)
)
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
set( PROJECT_FILES
set(PROJECT_FILES
# Default features # Default features
AddAndDelete/cafCmdAddItemExec.cpp AddAndDelete/cafCmdAddItemExec.cpp
AddAndDelete/cafCmdAddItemExec.h AddAndDelete/cafCmdAddItemExec.h
@@ -33,67 +33,63 @@ set( PROJECT_FILES
AddAndDelete/cafCmdDeleteItemExecData.h AddAndDelete/cafCmdDeleteItemExecData.h
AddAndDelete/cafCmdDeleteItemFeature.cpp AddAndDelete/cafCmdDeleteItemFeature.cpp
AddAndDelete/cafCmdDeleteItemFeature.h AddAndDelete/cafCmdDeleteItemFeature.h
ToggleCommands/cafToggleItemsFeature.cpp
ToggleCommands/cafToggleItemsFeature.cpp ToggleCommands/cafToggleItemsFeature.h
ToggleCommands/cafToggleItemsFeature.h ToggleCommands/cafToggleItemsFeatureImpl.cpp
ToggleCommands/cafToggleItemsFeatureImpl.cpp ToggleCommands/cafToggleItemsFeatureImpl.h
ToggleCommands/cafToggleItemsFeatureImpl.h ToggleCommands/cafToggleItemsOffFeature.cpp
ToggleCommands/cafToggleItemsOffFeature.cpp ToggleCommands/cafToggleItemsOffFeature.h
ToggleCommands/cafToggleItemsOffFeature.h ToggleCommands/cafToggleItemsOnFeature.cpp
ToggleCommands/cafToggleItemsOnFeature.cpp ToggleCommands/cafToggleItemsOnFeature.h
ToggleCommands/cafToggleItemsOnFeature.h ToggleCommands/cafToggleItemsOnOthersOffFeature.cpp
ToggleCommands/cafToggleItemsOnOthersOffFeature.cpp ToggleCommands/cafToggleItemsOnOthersOffFeature.h)
ToggleCommands/cafToggleItemsOnOthersOffFeature.h
)
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent scope # NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent
# CMakeList.txt in the application folder (parent scope) must use the following syntax # scope CMakeList.txt in the application folder (parent scope) must use the
# to make sure the QRC_FILES variable contains appended files in subfolders # following syntax to make sure the QRC_FILES variable contains appended files
# in subfolders
# set( QRC_FILES # set( QRC_FILES ${QRC_FILES} <Path/To/ApplicationResourceFile.qrc> )
# ${QRC_FILES}
# <Path/To/ApplicationResourceFile.qrc>
# )
set( QRC_FILES set(QRC_FILES
${QRC_FILES} ${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafCommandFeatures.qrc
${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafCommandFeatures.qrc PARENT_SCOPE)
PARENT_SCOPE
)
# NOTE! Adding the library as a cmake "OBJECT" library # NOTE! Adding the library as a cmake "OBJECT" library to make sure the linker
# to make sure the linker is not pruning the seemingly unused features, # is not pruning the seemingly unused features, and to make sure that the static
# and to make sure that the static initialization based registration of the features into the factory is done properly # initialization based registration of the features into the factory is done
# see https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/Object-Library # properly see
# and https://cmake.org/cmake/help/v3.15/command/add_library.html?highlight=add_library#object-libraries # https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/Object-Library
add_library( ${PROJECT_NAME} OBJECT # and
${PROJECT_FILES} # https://cmake.org/cmake/help/v3.15/command/add_library.html?highlight=add_library#object-libraries
${MOC_SOURCE_FILES} add_library(${PROJECT_NAME} OBJECT ${PROJECT_FILES} ${MOC_SOURCE_FILES})
)
target_include_directories(${PROJECT_NAME} target_include_directories(
${PROJECT_NAME}
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
$<TARGET_PROPERTY:cafCommand,INCLUDE_DIRECTORIES> # Needed for cmake version < 3.12. Remove when we can use target_link_libraries $<TARGET_PROPERTY:cafCommand,INCLUDE_DIRECTORIES> # Needed for cmake version
$<TARGET_PROPERTY:cafUserInterface,INCLUDE_DIRECTORIES> # Needed for cmake version < 3.12. Remove when we can use target_link_libraries # < 3.12. Remove when we
# can use
# target_link_libraries
$<TARGET_PROPERTY:cafUserInterface,INCLUDE_DIRECTORIES> # Needed for cmake
# version < 3.12.
# Remove when we can
# use
# target_link_libraries
) )
# Before cmake 3.12 OBJECT libraries could not use the target_link_libraries command, # Before cmake 3.12 OBJECT libraries could not use the target_link_libraries
# So we need to set the POSITION_INDEPENDENT_CODE option manually # command, So we need to set the POSITION_INDEPENDENT_CODE option manually
set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
# Not to be used until we can use cmake 3.12 or above # Not to be used until we can use cmake 3.12 or above target_link_libraries (
#target_link_libraries ( ${PROJECT_NAME} # ${PROJECT_NAME} cafCommand cafUserInterface ${QT_LIBRARIES} )
# cafCommand
# cafUserInterface
# ${QT_LIBRARIES}
#)
if(MSVC)
if (MSVC) set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127") "/W4 /wd4100 /wd4127")
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

20
Fwk/AppFwk/cafHexInterpolator/CMakeLists.txt
View File

@@ -1,21 +1,13 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafHexInterpolator) project(cafHexInterpolator)
set( PROJECT_FILES set(PROJECT_FILES cafHexInterpolator.h)
cafHexInterpolator.h
)
add_library(${PROJECT_NAME} ${PROJECT_FILES})
add_library( ${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
${PROJECT_FILES}
)
target_include_directories(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} LibCore)
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries( ${PROJECT_NAME} LibCore )
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

37
Fwk/AppFwk/cafHexInterpolator/cafHexInterpolator_UnitTest/CMakeLists.txt
View File

@@ -1,34 +1,29 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafHexInterpolator_UnitTests ) project(cafHexInterpolator_UnitTests)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code
# related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") message(
STATUS
"Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
)
endif() endif()
set (VIZ_MODULES_FOLDER_NAME ../../../../Fwk/VizFwk) set(VIZ_MODULES_FOLDER_NAME ../../../../Fwk/VizFwk)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore LibCoreDir}) add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore LibCoreDir})
include_directories ( include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )
set( PROJECT_FILES set(PROJECT_FILES cafHexInterpolatorBasicTest.cpp
cafHexInterpolatorBasicTest.cpp cafHexInterpolator_UnitTests_main.cpp)
cafHexInterpolator_UnitTests_main.cpp
)
# add the executable # add the executable
add_executable (${PROJECT_NAME} add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
${PROJECT_FILES}
gtest/gtest-all.cpp
)
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} LibCore)
LibCore
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

84
Fwk/AppFwk/cafPdmCvf/CMakeLists.txt
View File

@@ -1,61 +1,55 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafPdmCvf) project(cafPdmCvf)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_definitions(-DCVF_USING_CMAKE) add_definitions(-DCVF_USING_CMAKE)
add_library( ${PROJECT_NAME} add_library(
cafPdmCoreColor3f.h ${PROJECT_NAME}
cafPdmUiCoreColor3f.cpp cafPdmCoreColor3f.h
cafPdmUiCoreColor3f.h cafPdmUiCoreColor3f.cpp
cafPdmXmlColor3f.cpp cafPdmUiCoreColor3f.h
cafPdmXmlColor3f.h cafPdmXmlColor3f.cpp
cafPdmFieldCvfColor.h cafPdmXmlColor3f.h
cafPdmCoreVec3d.h cafPdmFieldCvfColor.h
cafPdmUiCoreVec3d.cpp cafPdmCoreVec3d.h
cafPdmUiCoreVec3d.h cafPdmUiCoreVec3d.cpp
cafPdmXmlVec3d.cpp cafPdmUiCoreVec3d.h
cafPdmXmlVec3d.h cafPdmXmlVec3d.cpp
cafPdmFieldCvfVec3d.h cafPdmXmlVec3d.h
cafPdmFieldCvfVec3d.h
cafPdmCoreMat4d.h
# cafPdmUiCoreVec3d.cpp no special editor for matrix is created yet
cafPdmUiCoreMat4d.h
cafPdmXmlMat4d.cpp
cafPdmXmlMat4d.h
cafPdmFieldCvfMat4d.h
cafPdmMat3d/cafPdmCoreMat3d.h
cafPdmMat3d/cafPdmUiCoreMat3d.h
cafPdmMat3d/cafPdmXmlMat3d.cpp
cafPdmMat3d/cafPdmXmlMat3d.h
cafPdmMat3d/cafPdmFieldCvfMat3d.h
${MOC_HEADER_FILES}
${MOC_SOURCE_FILES})
cafPdmCoreMat4d.h target_include_directories(
# cafPdmUiCoreVec3d.cpp no special editor for matrix is created yet ${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
cafPdmUiCoreMat4d.h ${CMAKE_CURRENT_SOURCE_DIR}/cafPdmMat3d)
cafPdmXmlMat4d.cpp
cafPdmXmlMat4d.h
cafPdmFieldCvfMat4d.h
cafPdmMat3d/cafPdmCoreMat3d.h target_link_libraries(${PROJECT_NAME} cafUserInterface LibCore ${QT_LIBRARIES})
cafPdmMat3d/cafPdmUiCoreMat3d.h
cafPdmMat3d/cafPdmXmlMat3d.cpp
cafPdmMat3d/cafPdmXmlMat3d.h
cafPdmMat3d/cafPdmFieldCvfMat3d.h
${MOC_HEADER_FILES}
${MOC_SOURCE_FILES}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cafPdmMat3d
)
target_link_libraries ( ${PROJECT_NAME}
cafUserInterface
LibCore
${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

104
Fwk/AppFwk/cafPdmCvf/cafPdmCvf_UnitTests/CMakeLists.txt
View File

@@ -1,73 +1,63 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
find_package(Qt5 CONFIG COMPONENTS Core) find_package(Qt5 CONFIG COMPONENTS Core)
if (Qt5Core_FOUND) if(Qt5Core_FOUND)
find_package(Qt5 CONFIG REQUIRED Core) find_package(Qt5 CONFIG REQUIRED Core)
else() else()
find_package(Qt4 COMPONENTS QtCore REQUIRED) find_package(
include(${QT_USE_FILE}) Qt4
COMPONENTS QtCore
REQUIRED)
include(${QT_USE_FILE})
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
project ( cafPdmCvf_UnitTests ) project(cafPdmCvf_UnitTests)
include_directories ( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${cafPdmCore_SOURCE_DIR} ${cafPdmXml_SOURCE_DIR}
${cafPdmCore_SOURCE_DIR} ${cafPdmCvf_SOURCE_DIR} ${LibCore_SOURCE_DIR})
${cafPdmXml_SOURCE_DIR}
${cafPdmCvf_SOURCE_DIR}
${LibCore_SOURCE_DIR}
)
set(PROJECT_FILES
cafPdmCvf_UnitTests.cpp gtest/gtest-all.cpp cafPdmCoreVec3dTest.cpp
cafPdmCoreColor3fTest.cpp cafPdmCoreMat4dTest.cpp)
set( PROJECT_FILES # add the executable
add_executable(${PROJECT_NAME} ${PROJECT_FILES})
cafPdmCvf_UnitTests.cpp if(Qt5Core_FOUND)
gtest/gtest-all.cpp set(QT_LIBRARIES Qt5::Core)
cafPdmCoreVec3dTest.cpp
cafPdmCoreColor3fTest.cpp
cafPdmCoreMat4dTest.cpp
)
# add the executable
add_executable (${PROJECT_NAME}
${PROJECT_FILES}
)
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core)
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafPdmCore cafPdmXml LibCore cafPdmCvf
cafPdmCore ${QT_LIBRARIES})
cafPdmXml
LibCore
cafPdmCvf
${QT_LIBRARIES}
)
# Copy Qt Dlls # Copy Qt Dlls
if (Qt5Core_FOUND) if(Qt5Core_FOUND)
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
endforeach(qtlib) COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
# Copy Qt Dlls $<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)
# Copy Qt Dlls
else() else()
# Copy Qt Dlls # Copy Qt Dlls
if (MSVC) if(MSVC)
set (QTLIBLIST QtCore) set(QTLIBLIST QtCore)
foreach (qtlib ${QTLIBLIST}) foreach(qtlib ${QTLIBLIST})
# Debug # Debug
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll) execute_process(
COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll
# Release ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll)
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib ) # Release
endif(MSVC) execute_process(
endif(Qt5Core_FOUND) COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll
${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach(qtlib)
endif(MSVC)
endif(Qt5Core_FOUND)

88
Fwk/AppFwk/cafPdmScripting/CMakeLists.txt
View File

@@ -1,67 +1,55 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafPdmScripting) project(cafPdmScripting)
option(CAF_CVF_SCRIPTING "Enable CVF-data support in Scripting" OFF) option(CAF_CVF_SCRIPTING "Enable CVF-data support in Scripting" OFF)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
set( PROJECT_FILES set(PROJECT_FILES
cafPdmCodeGenerator.h cafPdmCodeGenerator.h
cafPdmAbstractFieldScriptingCapability.h cafPdmAbstractFieldScriptingCapability.h
cafPdmAbstractFieldScriptingCapability.cpp cafPdmAbstractFieldScriptingCapability.cpp
cafPdmFieldScriptingCapability.h cafPdmFieldScriptingCapability.h
cafPdmFieldScriptingCapability.cpp cafPdmFieldScriptingCapability.cpp
cafPdmObjectMethod.h cafPdmObjectMethod.h
cafPdmObjectMethod.cpp cafPdmObjectMethod.cpp
cafPdmObjectScriptingCapabilityRegister.h cafPdmObjectScriptingCapabilityRegister.h
cafPdmObjectScriptingCapabilityRegister.cpp cafPdmObjectScriptingCapabilityRegister.cpp
cafPdmPythonGenerator.h cafPdmPythonGenerator.h
cafPdmPythonGenerator.cpp cafPdmPythonGenerator.cpp
cafPdmScriptIOMessages.h cafPdmScriptIOMessages.h
cafPdmScriptIOMessages.cpp cafPdmScriptIOMessages.cpp
cafPdmObjectScriptingCapability.h cafPdmObjectScriptingCapability.h
cafPdmObjectScriptingCapability.cpp cafPdmObjectScriptingCapability.cpp
cafPdmScriptResponse.h cafPdmScriptResponse.h
cafPdmScriptResponse.cpp cafPdmScriptResponse.cpp
cafPdmMarkdownGenerator.h cafPdmMarkdownGenerator.h
cafPdmMarkdownGenerator.cpp cafPdmMarkdownGenerator.cpp
cafPdmMarkdownBuilder.h cafPdmMarkdownBuilder.h
cafPdmMarkdownBuilder.cpp cafPdmMarkdownBuilder.cpp)
)
set (CAF_LIBS cafProjectDataModel) set(CAF_LIBS cafProjectDataModel)
if (CAF_CVF_SCRIPTING) if(CAF_CVF_SCRIPTING)
list(APPEND PROJECT_FILES list(
cafPdmFieldScriptingCapabilityCvfColor3.h APPEND
cafPdmFieldScriptingCapabilityCvfColor3.cpp PROJECT_FILES
cafPdmFieldScriptingCapabilityCvfVec3d.h cafPdmFieldScriptingCapabilityCvfColor3.h
cafPdmFieldScriptingCapabilityCvfVec3d.cpp cafPdmFieldScriptingCapabilityCvfColor3.cpp
) cafPdmFieldScriptingCapabilityCvfVec3d.h
list(APPEND CAF_LIBS cafPdmCvf) cafPdmFieldScriptingCapabilityCvfVec3d.cpp)
list(APPEND CAF_LIBS cafPdmCvf)
endif() endif()
add_library(${PROJECT_NAME} ${PROJECT_FILES})
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_library( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} ${CAF_LIBS})
${PROJECT_FILES}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
${CAF_LIBS}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

55
Fwk/AppFwk/cafPdmScripting/cafPdmScripting_UnitTests/CMakeLists.txt
View File

@@ -1,41 +1,42 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafPdmScripting_UnitTests ) project(cafPdmScripting_UnitTests)
find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui) find_package(
Qt5
COMPONENTS
REQUIRED Core Xml Gui)
set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui) set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code
# related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") message(
STATUS
"Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
)
endif() endif()
include_directories ( include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )
# add the executable # add the executable
add_executable (${PROJECT_NAME} add_executable(${PROJECT_NAME} cafPdmScripting_UnitTests.cpp
cafPdmScripting_UnitTests.cpp gtest/gtest-all.cpp cafPdmScriptingBasicTest.cpp)
gtest/gtest-all.cpp
cafPdmScriptingBasicTest.cpp target_link_libraries(${PROJECT_NAME} cafPdmScripting ${QT_LIBRARIES}
) ${THREAD_LIBRARY})
target_link_libraries ( ${PROJECT_NAME}
cafPdmScripting
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls # Copy Qt Dlls
if (Qt5Core_FOUND) if(Qt5Core_FOUND)
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
endforeach(qtlib) COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
endif(Qt5Core_FOUND) $<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)
endif(Qt5Core_FOUND)

50
Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
View File

@@ -1,45 +1,39 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafProjectDataModel) project(cafProjectDataModel)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set( PROJECT_FILES set(PROJECT_FILES
cafFactory.h cafFactory.h
cafOmpMutex.h cafOmpMutex.h
cafPdmDocument.cpp cafPdmDocument.cpp
cafPdmDocument.h cafPdmDocument.h
cafPdmObjectGroup.cpp cafPdmObjectGroup.cpp
cafPdmObjectGroup.h cafPdmObjectGroup.h
cafPdmObject.cpp cafPdmObject.cpp
cafPdmObject.h cafPdmObject.h)
)
add_library( ${PROJECT_NAME} add_library(${PROJECT_NAME} ${PROJECT_FILES})
${PROJECT_FILES}
)
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafPdmUiCore cafPdmXml ${QT_LIBRARIES})
cafPdmUiCore
cafPdmXml
${QT_LIBRARIES}
)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
if (MSVC) if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

38
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
View File

@@ -1,18 +1,20 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafPdmCore) project(cafPdmCore)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
find_package(Qt5 COMPONENTS REQUIRED Core) find_package(
Qt5
COMPONENTS
REQUIRED Core)
set(QT_LIBRARIES Qt5::Core) set(QT_LIBRARIES Qt5::Core)
set( PROJECT_FILES set(PROJECT_FILES
cafAssert.h cafAssert.h
cafAppEnum.h cafAppEnum.h
cafClassTypeName.h cafClassTypeName.h
@@ -44,37 +46,29 @@ set( PROJECT_FILES
cafPdmReferenceHelper.h cafPdmReferenceHelper.h
cafPdmUiFieldHandleInterface.h cafPdmUiFieldHandleInterface.h
cafPdmValueField.h cafPdmValueField.h
cafInternalPdmValueFieldSpecializations.h cafInternalPdmValueFieldSpecializations.h
cafNotificationCenter.cpp cafNotificationCenter.cpp
cafNotificationCenter.h cafNotificationCenter.h
cafSignal.h cafSignal.h
cafSignal.cpp cafSignal.cpp
cafTristate.cpp cafTristate.cpp
cafTristate.h cafTristate.h
cafFilePath.cpp cafFilePath.cpp
cafFilePath.h cafFilePath.h
cafAsyncObjectDeleter.h cafAsyncObjectDeleter.h
cafAsyncObjectDeleter.inl cafAsyncObjectDeleter.inl
cafAsyncWorkerManager.h cafAsyncWorkerManager.h
cafAsyncWorkerManager.cpp cafAsyncWorkerManager.cpp)
)
add_library( ${PROJECT_NAME} add_library(${PROJECT_NAME} ${PROJECT_FILES})
${PROJECT_FILES}
)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES}) target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
if (MSVC) if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

77
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt
View File

@@ -1,61 +1,58 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafPdmCore_UnitTests ) project(cafPdmCore_UnitTests)
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui) set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code
# related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") message(
STATUS
"Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
)
endif() endif()
include_directories ( include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )
set(PROJECT_FILES
set( PROJECT_FILES cafPdmCore_UnitTests.cpp
gtest/gtest-all.cpp
cafPdmCore_UnitTests.cpp cafPdmCoreBasicTest.cpp
gtest/gtest-all.cpp
cafPdmCoreBasicTest.cpp
cafPdmReferenceHelperTest.cpp cafPdmReferenceHelperTest.cpp
cafPdmChildArrayFieldHandleTest.cpp cafPdmChildArrayFieldHandleTest.cpp
cafSignalTest.cpp cafSignalTest.cpp
Child.cpp
Child.h
Parent.cpp
Parent.h
TestObj.cpp
TestObj.h)
Child.cpp # add the executable
Child.h add_executable(${PROJECT_NAME} ${PROJECT_FILES})
Parent.cpp
Parent.h
TestObj.cpp
TestObj.h
)
# add the executable
add_executable (${PROJECT_NAME}
${PROJECT_FILES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
if(Qt5Core_FOUND)
if (Qt5Core_FOUND) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif() endif()
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES}
cafPdmCore ${THREAD_LIBRARY})
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
# Copy Qt Dlls # Copy Qt Dlls
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib) endforeach(qtlib)

87
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
View File

@@ -1,39 +1,34 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafPdmUiCore) project(cafPdmUiCore)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# These headers need to go through Qt's MOC compiler # These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES set(MOC_HEADER_FILES cafPdmUiEditorHandle.h cafPdmUiFieldEditorHandle.h
cafPdmUiEditorHandle.h cafPdmUiSelection3dEditorVisualizer.h cafQShortenedLabel.h)
cafPdmUiFieldEditorHandle.h
cafPdmUiSelection3dEditorVisualizer.h
cafQShortenedLabel.h
)
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
include_directories ( include_directories(..)
..
)
add_definitions(-DCVF_USING_CMAKE) add_definitions(-DCVF_USING_CMAKE)
set( PROJECT_FILES set(PROJECT_FILES
cafInternalPdmFieldTypeSpecializations.h cafInternalPdmFieldTypeSpecializations.h
cafInternalPdmUiFieldCapability.h cafInternalPdmUiFieldCapability.h
cafInternalPdmUiFieldCapability.inl cafInternalPdmUiFieldCapability.inl
cafInternalPdmUiCommandSystemInterface.h cafInternalPdmUiCommandSystemInterface.h
cafPdmUiEditorHandle.cpp cafPdmUiEditorHandle.cpp
cafPdmUiEditorHandle.h cafPdmUiEditorHandle.h
cafPdmUiFieldEditorHandle.cpp cafPdmUiFieldEditorHandle.cpp
@@ -62,54 +57,40 @@ set( PROJECT_FILES
cafUiTreeItem.h cafUiTreeItem.h
cafPdmUiGroup.cpp cafPdmUiGroup.cpp
cafPdmUiGroup.h cafPdmUiGroup.h
cafSelectionManager.cpp cafSelectionManager.cpp
cafSelectionManager.h cafSelectionManager.h
cafSelectionChangedReceiver.h cafSelectionChangedReceiver.h
cafSelectionChangedReceiver.cpp cafSelectionChangedReceiver.cpp
cafSelectionManagerTools.h cafSelectionManagerTools.h
cafPdmUiSelection3dEditorVisualizer.h cafPdmUiSelection3dEditorVisualizer.h
cafPdmUiSelection3dEditorVisualizer.cpp cafPdmUiSelection3dEditorVisualizer.cpp
cafQShortenedLabel.cpp cafQShortenedLabel.cpp
cafQShortenedLabel.h cafQShortenedLabel.h
cafIconProvider.cpp cafIconProvider.cpp
cafIconProvider.h cafIconProvider.h
cafFontTools.cpp cafFontTools.cpp
cafFontTools.h cafFontTools.h)
)
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent scope # NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent
# CMakeList.txt in the application folder (parent scope) must use the following syntax # scope CMakeList.txt in the application folder (parent scope) must use the
# to make sure the QRC_FILES variable contains appended files in subfolders # following syntax to make sure the QRC_FILES variable contains appended files
# in subfolders
# set( QRC_FILES # set( QRC_FILES ${QRC_FILES} Resources/MyaApplication.qrc )
# ${QRC_FILES}
# Resources/MyaApplication.qrc
# )
set( QRC_FILES set(QRC_FILES
${QRC_FILES} ${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/caf.qrc
${CMAKE_CURRENT_SOURCE_DIR}/Resources/caf.qrc PARENT_SCOPE)
PARENT_SCOPE
)
add_library( ${PROJECT_NAME} add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
${PROJECT_FILES}
${MOC_SOURCE_FILES}
)
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES})
cafPdmCore
${QT_LIBRARIES}
)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
if (MSVC) if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

85
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
View File

@@ -1,67 +1,54 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafPdmXml) project(cafPdmXml)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Xml) find_package(
Qt5
COMPONENTS
REQUIRED Core Xml)
set(QT_LIBRARIES Qt5::Core Qt5::Xml) set(QT_LIBRARIES Qt5::Core Qt5::Xml)
include_directories ( include_directories(..)
..
)
set( PROJECT_FILES set(PROJECT_FILES
cafInternalPdmFieldIoHelper.cpp cafInternalPdmFieldIoHelper.cpp
cafInternalPdmFieldIoHelper.h cafInternalPdmFieldIoHelper.h
cafInternalPdmFilePathStreamOperators.cpp cafInternalPdmFilePathStreamOperators.cpp
cafInternalPdmFilePathStreamOperators.h cafInternalPdmFilePathStreamOperators.h
cafInternalPdmStreamOperators.cpp cafInternalPdmStreamOperators.cpp
cafInternalPdmStreamOperators.h cafInternalPdmStreamOperators.h
cafInternalPdmXmlFieldCapability.h cafInternalPdmXmlFieldCapability.h
cafInternalPdmXmlFieldCapability.inl cafInternalPdmXmlFieldCapability.inl
cafInternalPdmXmlFieldReaderWriter.cpp cafInternalPdmXmlFieldReaderWriter.cpp
cafInternalPdmXmlFieldReaderWriter.h cafInternalPdmXmlFieldReaderWriter.h
cafPdmXmlFieldHandle.cpp
cafPdmXmlFieldHandle.h
cafPdmXmlObjectHandle.cpp
cafPdmXmlObjectHandle.h
cafPdmXmlObjectHandleMacros.h
cafPdmDefaultObjectFactory.cpp
cafPdmDefaultObjectFactory.h
cafPdmObjectFactory.h
cafPdmSettings.h
cafPdmSettings.cpp
cafPdmXmlStringValidation.h)
cafPdmXmlFieldHandle.cpp add_library(${PROJECT_NAME} ${PROJECT_FILES})
cafPdmXmlFieldHandle.h
cafPdmXmlObjectHandle.cpp
cafPdmXmlObjectHandle.h
cafPdmXmlObjectHandleMacros.h
cafPdmDefaultObjectFactory.cpp target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES})
cafPdmDefaultObjectFactory.h
cafPdmObjectFactory.h
cafPdmSettings.h
cafPdmSettings.cpp
cafPdmXmlStringValidation.h target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
)
if(MSVC)
add_library( ${PROJECT_NAME} set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
${PROJECT_FILES} "/W4 /wd4100 /wd4127")
)
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore
${QT_LIBRARIES}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif() endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

62
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt
View File

@@ -1,48 +1,48 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafPdmXml_UnitTests ) project(cafPdmXml_UnitTests)
find_package(Qt5 COMPONENTS REQUIRED Core Xml) find_package(
Qt5
COMPONENTS
REQUIRED Core Xml)
set(QT_LIBRARIES Qt5::Core Qt5::Xml) set(QT_LIBRARIES Qt5::Core Qt5::Xml)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code
# related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") message(
STATUS
"Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
)
endif() endif()
include_directories ( include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )
# add the executable # add the executable
add_executable (${PROJECT_NAME} add_executable(
cafPdmXml_UnitTests.cpp ${PROJECT_NAME}
gtest/gtest-all.cpp cafPdmXml_UnitTests.cpp gtest/gtest-all.cpp cafPdmXmlBasicTest.cpp
cafPdmAdvancedTemplateTest.cpp cafPdmXmlNumberTest.cpp cafPdmPtrArrayTest.cpp)
cafPdmXmlBasicTest.cpp if(Qt5Core_FOUND)
cafPdmAdvancedTemplateTest.cpp set(QT_LIBRARIES Qt5::Core Qt5::Xml)
cafPdmXmlNumberTest.cpp
cafPdmPtrArrayTest.cpp
)
if (Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
endif() endif()
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafPdmXml ${QT_LIBRARIES}
cafPdmXml ${THREAD_LIBRARY})
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls # Copy Qt Dlls
if (Qt5Core_FOUND) if(Qt5Core_FOUND)
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
endforeach(qtlib) COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)

55
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt
View File

@@ -1,46 +1,43 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafProjectDataModel_UnitTests ) project(cafProjectDataModel_UnitTests)
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Xml Gui) find_package(
Qt5
COMPONENTS
REQUIRED Core Xml Gui)
set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui) set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code
# related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") message(
STATUS
"Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
)
endif() endif()
include_directories ( include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )
set( PROJECT_FILES set(PROJECT_FILES cafPdmBasicTest.cpp cafProjectDataModel_UnitTests.cpp
cafPdmBasicTest.cpp Child.cpp Parent.cpp TestObj.cpp)
cafProjectDataModel_UnitTests.cpp
Child.cpp
Parent.cpp
TestObj.cpp
)
# add the executable # add the executable
add_executable (${PROJECT_NAME} add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
${PROJECT_FILES}
gtest/gtest-all.cpp
)
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES}
cafProjectDataModel ${THREAD_LIBRARY})
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls # Copy Qt Dlls
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib) endforeach(qtlib)

22
Fwk/AppFwk/cafTensor/CMakeLists.txt
View File

@@ -1,23 +1,13 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafTensor) project(cafTensor)
set( PROJECT_FILES set(PROJECT_FILES cafTensor3.cpp cafTensor3.h cafTensor3.inl)
cafTensor3.cpp
cafTensor3.h
cafTensor3.inl
)
add_library(${PROJECT_NAME} ${PROJECT_FILES})
add_library( ${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
${PROJECT_FILES}
)
target_include_directories(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} LibCore)
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries( ${PROJECT_NAME} LibCore )
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

104
Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
View File

@@ -1,42 +1,35 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafTestApplication ) project(cafTestApplication)
# Open GL # Open GL
find_package( OpenGL ) find_package(OpenGL)
# Qt # Qt
# Qt MOC # Qt MOC
set (MOC_HEADER_FILES set(MOC_HEADER_FILES MainWindow.h WidgetLayoutTest.h CustomObjectEditor.h
MainWindow.h MenuItemProducer.h)
WidgetLayoutTest.h
CustomObjectEditor.h
MenuItemProducer.h
)
# Resource file # Resource file
set( QRC_FILES set(QRC_FILES ${QRC_FILES} textedit.qrc)
${QRC_FILES}
textedit.qrc
)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
qt5_add_resources( QRC_FILES_CPP ${QRC_FILES} ) qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON) option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
if (USE_COMMAND_FRAMEWORK) if(USE_COMMAND_FRAMEWORK)
include_directories ( include_directories(${cafCommand_SOURCE_DIR})
${cafCommand_SOURCE_DIR} add_definitions(-DTAP_USE_COMMAND_FRAMEWORK)
)
ADD_DEFINITIONS(-DTAP_USE_COMMAND_FRAMEWORK)
endif(USE_COMMAND_FRAMEWORK) endif(USE_COMMAND_FRAMEWORK)
set(PROJECT_FILES
set( PROJECT_FILES
Main.cpp Main.cpp
MainWindow.cpp MainWindow.cpp
MainWindow.h MainWindow.h
@@ -48,50 +41,45 @@ set( PROJECT_FILES
CustomObjectEditor.h CustomObjectEditor.h
MenuItemProducer.cpp MenuItemProducer.cpp
MenuItemProducer.h MenuItemProducer.h
TamComboBox.h TamComboBox.h
TamComboBox.cpp TamComboBox.cpp)
# add the executable
add_executable(
${PROJECT_NAME}
${PROJECT_FILES}
${MOC_SOURCE_FILES}
${QRC_FILES_CPP}
$<TARGET_OBJECTS:cafCommandFeatures> # Needed for cmake version < 3.12. Remove
# when we can use target_link_libraries
# with OBJECT libraries
) )
set(TAP_LINK_LIBRARIES cafUserInterface)
# add the executable if(USE_COMMAND_FRAMEWORK)
add_executable ( ${PROJECT_NAME} set(TAP_LINK_LIBRARIES
${PROJECT_FILES} ${TAP_LINK_LIBRARIES} cafCommand
${MOC_SOURCE_FILES} # cafCommandFeatures # Not possible using cmake version < 3.12. Use when
${QRC_FILES_CPP} # we can use target_link_libraries with OBJECT libraries
$<TARGET_OBJECTS:cafCommandFeatures> # Needed for cmake version < 3.12. Remove when we can use target_link_libraries with OBJECT libraries )
)
set (TAP_LINK_LIBRARIES
cafUserInterface
)
if (USE_COMMAND_FRAMEWORK)
set (TAP_LINK_LIBRARIES
${TAP_LINK_LIBRARIES}
cafCommand
#cafCommandFeatures # Not possible using cmake version < 3.12. Use when we can use target_link_libraries with OBJECT libraries
)
endif(USE_COMMAND_FRAMEWORK) endif(USE_COMMAND_FRAMEWORK)
# According to ivarun this is needed on OpenSuse, and Fedora. See: https://github.com/OPM/ResInsight/pull/7 # According to ivarun this is needed on OpenSuse, and Fedora. See:
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") # https://github.com/OPM/ResInsight/pull/7
list(APPEND EXTERNAL_LINK_LIBRARIES if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
rt list(APPEND EXTERNAL_LINK_LIBRARIES rt pthread)
pthread
)
endif() endif()
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} ${TAP_LINK_LIBRARIES} ${QT_LIBRARIES}
${TAP_LINK_LIBRARIES} ${EXTERNAL_LINK_LIBRARIES})
${QT_LIBRARIES}
${EXTERNAL_LINK_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib) endforeach(qtlib)

109
Fwk/AppFwk/cafTests/cafTestCvfApplication/CMakeLists.txt
View File

@@ -1,94 +1,61 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project ( cafTestCvfApplication )
project(cafTestCvfApplication)
# Qt MOC # Qt MOC
set ( MOC_HEADER_FILES set(MOC_HEADER_FILES MainWindow.h WidgetLayoutTest.h)
MainWindow.h
WidgetLayoutTest.h
)
# Resource file # Resource file
set( QRC_FILES set(QRC_FILES textedit.qrc)
textedit.qrc
)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
qt5_add_resources( QRC_FILES_CPP ${QRC_FILES} ) qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON) option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
include_directories ( include_directories(
${LibCore_SOURCE_DIR} ${LibCore_SOURCE_DIR}
${LibGeometry_SOURCE_DIR} ${LibGeometry_SOURCE_DIR}
${LibGuiQt_SOURCE_DIR} ${LibGuiQt_SOURCE_DIR}
${LibRender_SOURCE_DIR} ${LibRender_SOURCE_DIR}
${LibViewing_SOURCE_DIR} ${LibViewing_SOURCE_DIR}
${cafProjectDataModel_SOURCE_DIR}
${cafProjectDataModel_SOURCE_DIR} ${cafUserInterface_SOURCE_DIR})
${cafUserInterface_SOURCE_DIR}
)
if (USE_COMMAND_FRAMEWORK) if(USE_COMMAND_FRAMEWORK)
include_directories ( include_directories(${cafCommand_SOURCE_DIR})
${cafCommand_SOURCE_DIR} add_definitions(-DTAP_USE_COMMAND_FRAMEWORK)
)
ADD_DEFINITIONS(-DTAP_USE_COMMAND_FRAMEWORK)
endif(USE_COMMAND_FRAMEWORK) endif(USE_COMMAND_FRAMEWORK)
include_directories(${cafPdmCore_SOURCE_DIR} ${cafPdmUiCore_SOURCE_DIR}
${cafPdmXml_SOURCE_DIR} ${cafPdmCvf_SOURCE_DIR})
include_directories ( set(PROJECT_FILES Main.cpp MainWindow.cpp WidgetLayoutTest.cpp
${cafPdmCore_SOURCE_DIR} TapCvfSpecialization.cpp TapProject.cpp)
${cafPdmUiCore_SOURCE_DIR}
${cafPdmXml_SOURCE_DIR}
${cafPdmCvf_SOURCE_DIR}
)
set( PROJECT_FILES # add the executable
Main.cpp add_executable(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES}
MainWindow.cpp ${QRC_FILES_CPP})
WidgetLayoutTest.cpp
TapCvfSpecialization.cpp
TapProject.cpp
)
set(TAP_LINK_LIBRARIES cafUserInterface cafPdmXml cafPdmCvf ${QT_LIBRARIES})
# add the executable if(USE_COMMAND_FRAMEWORK)
add_executable ( ${PROJECT_NAME} set(TAP_LINK_LIBRARIES ${TAP_LINK_LIBRARIES} cafCommand)
${PROJECT_FILES}
${MOC_SOURCE_FILES}
${QRC_FILES_CPP}
)
set (TAP_LINK_LIBRARIES
cafUserInterface
cafPdmXml
cafPdmCvf
${QT_LIBRARIES}
)
if (USE_COMMAND_FRAMEWORK)
set (TAP_LINK_LIBRARIES
${TAP_LINK_LIBRARIES}
cafCommand
)
endif(USE_COMMAND_FRAMEWORK) endif(USE_COMMAND_FRAMEWORK)
target_link_libraries(${PROJECT_NAME} ${TAP_LINK_LIBRARIES})
target_link_libraries ( ${PROJECT_NAME}
${TAP_LINK_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib) endforeach(qtlib)

76
Fwk/AppFwk/cafUserInterface/CMakeLists.txt
View File

@@ -1,27 +1,27 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafUserInterface) project(cafUserInterface)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
if (MSVC) if(MSVC)
# Define this one to tell windows.h to not define min() and max() as macros # Define this one to tell windows.h to not define min() and max() as macros
add_definitions(-DNOMINMAX) add_definitions(-DNOMINMAX)
endif (MSVC) endif(MSVC)
# These headers need to go through Qt's MOC compiler # These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES set(MOC_HEADER_FILES
cafPdmUiCheckBoxDelegate.h cafPdmUiCheckBoxDelegate.h
cafPdmUiCheckBoxEditor.h cafPdmUiCheckBoxEditor.h
cafPdmUiCheckBoxTristateEditor.h cafPdmUiCheckBoxTristateEditor.h
cafPdmUiColorEditor.h cafPdmUiColorEditor.h
cafPdmUiComboBoxEditor.h cafPdmUiComboBoxEditor.h
cafPdmUiDateEditor.h cafPdmUiDateEditor.h
cafPdmUiTimeEditor.h cafPdmUiTimeEditor.h
cafPdmUiDefaultObjectEditor.h cafPdmUiDefaultObjectEditor.h
cafPdmUiDoubleSliderEditor.h cafPdmUiDoubleSliderEditor.h
cafPdmUiFilePathEditor.h cafPdmUiFilePathEditor.h
@@ -44,7 +44,7 @@ set (MOC_HEADER_FILES
cafPdmUiTreeViewEditor.h cafPdmUiTreeViewEditor.h
cafUiProcess.h cafUiProcess.h
QMinimizePanel.h QMinimizePanel.h
cafQStyledProgressBar.h cafQStyledProgressBar.h
cafPdmUiTreeSelectionEditor.h cafPdmUiTreeSelectionEditor.h
cafPdmUiTreeSelectionQModel.h cafPdmUiTreeSelectionQModel.h
cafPdmUiFormLayoutObjectEditor.h cafPdmUiFormLayoutObjectEditor.h
@@ -52,15 +52,16 @@ set (MOC_HEADER_FILES
cafPdmUniqueIdValidator.h cafPdmUniqueIdValidator.h
cafPdmDoubleStringValidator.h cafPdmDoubleStringValidator.h
cafPdmUiPickableLineEditor.h cafPdmUiPickableLineEditor.h
cafPdmUiLabelEditor.h cafPdmUiLabelEditor.h)
)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
set( PROJECT_FILES set(PROJECT_FILES
# field editors # field editors
cafPdmUiCheckBoxDelegate.cpp cafPdmUiCheckBoxDelegate.cpp
cafPdmUiCheckBoxDelegate.h cafPdmUiCheckBoxDelegate.h
@@ -74,8 +75,8 @@ set( PROJECT_FILES
cafPdmUiComboBoxEditor.h cafPdmUiComboBoxEditor.h
cafPdmUiDateEditor.cpp cafPdmUiDateEditor.cpp
cafPdmUiDateEditor.h cafPdmUiDateEditor.h
cafPdmUiTimeEditor.cpp cafPdmUiTimeEditor.cpp
cafPdmUiTimeEditor.h cafPdmUiTimeEditor.h
cafPdmUiDoubleSliderEditor.cpp cafPdmUiDoubleSliderEditor.cpp
cafPdmUiDoubleSliderEditor.h cafPdmUiDoubleSliderEditor.h
cafPdmUiDragDropInterface.h cafPdmUiDragDropInterface.h
@@ -104,8 +105,6 @@ set( PROJECT_FILES
cafPdmUiFieldEditorHelper.h cafPdmUiFieldEditorHelper.h
cafPdmUiFieldEditorHelper.cpp cafPdmUiFieldEditorHelper.cpp
cafPdmUiLabelEditor.cpp cafPdmUiLabelEditor.cpp
# object editors # object editors
cafPdmUiDefaultObjectEditor.cpp cafPdmUiDefaultObjectEditor.cpp
cafPdmUiDefaultObjectEditor.h cafPdmUiDefaultObjectEditor.h
@@ -141,8 +140,6 @@ set( PROJECT_FILES
cafPdmUiFormLayoutObjectEditor.h cafPdmUiFormLayoutObjectEditor.h
cafPdmUiDoubleValueEditor.cpp cafPdmUiDoubleValueEditor.cpp
cafPdmUiDoubleValueEditor.h cafPdmUiDoubleValueEditor.h
# div # div
cafAboutDialog.cpp cafAboutDialog.cpp
cafAboutDialog.h cafAboutDialog.h
@@ -152,8 +149,8 @@ set( PROJECT_FILES
cafUiProcess.h cafUiProcess.h
QMinimizePanel.cpp QMinimizePanel.cpp
QMinimizePanel.h QMinimizePanel.h
cafQStyledProgressBar.cpp cafQStyledProgressBar.cpp
cafQStyledProgressBar.h cafQStyledProgressBar.h
cafQTreeViewStateSerializer.h cafQTreeViewStateSerializer.h
cafQTreeViewStateSerializer.cpp cafQTreeViewStateSerializer.cpp
cafMemoryInspector.h cafMemoryInspector.h
@@ -162,30 +159,21 @@ set( PROJECT_FILES
cafPdmDoubleStringValidator.cpp cafPdmDoubleStringValidator.cpp
cafPickEventHandler.h cafPickEventHandler.h
cafPdmUiPickableLineEditor.cpp cafPdmUiPickableLineEditor.cpp
cafStyleSheetTools.h cafStyleSheetTools.h
cafStyleSheetTools.cpp cafStyleSheetTools.cpp
cafPdmUiTabbedPropertyViewDialog.h cafPdmUiTabbedPropertyViewDialog.h
cafPdmUiTabbedPropertyViewDialog.cpp cafPdmUiTabbedPropertyViewDialog.cpp)
)
add_library( ${PROJECT_NAME} add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES}
${PROJECT_FILES} ${QRC_FILES_CPP})
${MOC_SOURCE_FILES}
${QRC_FILES_CPP}
)
if (MSVC) if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
endif() "/W4 /wd4100 /wd4127")
endif()
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES})
cafProjectDataModel
${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

92
Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/CMakeLists.txt
View File

@@ -1,64 +1,62 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafUserInterface_UnitTests ) project(cafUserInterface_UnitTests)
# Qt # Qt
option(CEE_USE_QT5 "Use Qt5" OFF) option(CEE_USE_QT5 "Use Qt5" OFF)
if (CEE_USE_QT5) if(CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets) find_package(
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) Qt5
COMPONENTS
REQUIRED Core Gui Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
else() else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain REQUIRED) find_package(
include(${QT_USE_FILE}) Qt4
COMPONENTS QtCore QtGui QtMain
REQUIRED)
include(${QT_USE_FILE})
endif(CEE_USE_QT5) endif(CEE_USE_QT5)
include_directories ( include_directories(${CMAKE_CURRENT_SOURCE_DIR})
${CMAKE_CURRENT_SOURCE_DIR}
)
set( PROJECT_FILES set(PROJECT_FILES cafUserInterface_UnitTests.cpp cafPdmUiTreeViewModelTest.cpp
cafPdmUiTreeSelectionQModelTest.cpp gtest/gtest-all.cpp)
cafUserInterface_UnitTests.cpp # add the executable
add_executable(${PROJECT_NAME} ${PROJECT_FILES})
cafPdmUiTreeViewModelTest.cpp
cafPdmUiTreeSelectionQModelTest.cpp
gtest/gtest-all.cpp
)
# add the executable
add_executable (${PROJECT_NAME}
${PROJECT_FILES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} cafUserInterface ${QT_LIBRARIES}
cafUserInterface ${THREAD_LIBRARY})
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
# Copy Qt Dlls # Copy Qt Dlls
if (Qt5Core_FOUND) if(Qt5Core_FOUND)
foreach (qtlib ${QT_LIBRARIES}) foreach(qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}> TARGET ${PROJECT_NAME}
) POST_BUILD
endforeach(qtlib) COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
# Copy Qt Dlls $<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)
# Copy Qt Dlls
else() else()
# Copy Qt Dlls # Copy Qt Dlls
if (MSVC) if(MSVC)
set (QTLIBLIST QtCore QtGui QtOpenGl ) set(QTLIBLIST QtCore QtGui QtOpenGl)
foreach (qtlib ${QTLIBLIST}) foreach(qtlib ${QTLIBLIST})
# Debug # Debug
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll) execute_process(
COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll
# Release ${CMAKE_BINARY_DIR}/Debug/${qtlib}d4.dll)
execute_process(COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll ${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach( qtlib ) # Release
endif(MSVC) execute_process(
COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}4.dll
${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll)
endforeach(qtlib)
endif(MSVC)
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)

86
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@@ -1,9 +1,9 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafViewer) project(cafViewer)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
@@ -11,53 +11,49 @@ endif()
# Qt # Qt
# These headers need to go through Qt's MOC compiler # These headers need to go through Qt's MOC compiler
set( MOC_HEADER_FILES set(MOC_HEADER_FILES cafViewer.h)
cafViewer.h
)
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_library( ${PROJECT_NAME} add_library(
cafCadNavigation.cpp ${PROJECT_NAME}
cafCadNavigation.h cafCadNavigation.cpp
cafCeetronNavigation.cpp cafCadNavigation.h
cafCeetronNavigation.h cafCeetronNavigation.cpp
cafCeetronPlusNavigation.cpp cafCeetronNavigation.h
cafCeetronPlusNavigation.h cafCeetronPlusNavigation.cpp
cafTrackBallBasedNavigation.cpp cafCeetronPlusNavigation.h
cafTrackBallBasedNavigation.h cafTrackBallBasedNavigation.cpp
cafNavigationPolicy.cpp cafTrackBallBasedNavigation.h
cafNavigationPolicy.h cafNavigationPolicy.cpp
cafPointOfInterestVisualizer.h cafNavigationPolicy.h
cafOpenGLWidget.cpp cafPointOfInterestVisualizer.h
cafOpenGLWidget.h cafOpenGLWidget.cpp
cafViewer.cpp cafOpenGLWidget.h
cafViewer.h cafViewer.cpp
cafViewer.h
${MOC_SOURCE_FILES})
${MOC_SOURCE_FILES} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
)
target_include_directories(${PROJECT_NAME} target_link_libraries(
PUBLIC ${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} LibCore
) LibGeometry
LibViewing
LibRender
LibGuiQt
cafAnimControl
${QT_LIBRARIES})
target_link_libraries ( ${PROJECT_NAME} if(MSVC)
LibCore set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
LibGeometry "/W4 /wd4100 /wd4127")
LibViewing endif()
LibRender
LibGuiQt
cafAnimControl
${QT_LIBRARIES}
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

103
Fwk/AppFwk/cafVizExtensions/CMakeLists.txt
View File

@@ -1,69 +1,66 @@
cmake_minimum_required (VERSION 3.12) cmake_minimum_required(VERSION 3.12)
project (cafVizExtensions) project(cafVizExtensions)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true) set(CMAKE_UNITY_BUILD true)
endif() endif()
# Open GL # Open GL
find_package( OpenGL ) find_package(OpenGL)
# Qt # Qt
find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) find_package(
Qt5
COMPONENTS
REQUIRED Core Gui Widgets OpenGL)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_library( ${PROJECT_NAME} add_library(
cafDisplayCoordTransform.cpp ${PROJECT_NAME}
cafDisplayCoordTransform.h cafDisplayCoordTransform.cpp
cafBoxManipulatorPartManager.cpp cafDisplayCoordTransform.h
cafBoxManipulatorPartManager.h cafBoxManipulatorPartManager.cpp
cafBoxManipulatorGeometryGenerator.cpp cafBoxManipulatorPartManager.h
cafBoxManipulatorGeometryGenerator.h cafBoxManipulatorGeometryGenerator.cpp
cafTitledOverlayFrame.cpp cafBoxManipulatorGeometryGenerator.h
cafTitledOverlayFrame.h cafTitledOverlayFrame.cpp
cafCategoryLegend.cpp cafTitledOverlayFrame.h
cafCategoryLegend.h cafCategoryLegend.cpp
cafOverlayScalarMapperLegend.h cafCategoryLegend.h
cafOverlayScalarMapperLegend.cpp cafOverlayScalarMapperLegend.h
cafOverlayScaleLegend.h cafOverlayScalarMapperLegend.cpp
cafOverlayScaleLegend.cpp cafOverlayScaleLegend.h
cafInternalLegendRenderTools.h cafOverlayScaleLegend.cpp
cafInternalLegendRenderTools.cpp cafInternalLegendRenderTools.h
cafCategoryMapper.cpp cafInternalLegendRenderTools.cpp
cafCategoryMapper.h cafCategoryMapper.cpp
cafFixedAtlasFont.h cafCategoryMapper.h
cafFixedAtlasFont.cpp cafFixedAtlasFont.h
cafTransparentWBRenderConfiguration.h cafFixedAtlasFont.cpp
cafTransparentWBRenderConfiguration.cpp cafTransparentWBRenderConfiguration.h
cafLine.h cafTransparentWBRenderConfiguration.cpp
cafLine.inl cafLine.h
TranspWB_CombinationFrag.glsl cafLine.inl
TranspWB_PartlyTranspPartsFrag.glsl TranspWB_CombinationFrag.glsl
TranspWB_TransparentPartsFrag.glsl TranspWB_PartlyTranspPartsFrag.glsl
TranspWB_TransparentPartsFrag.glsl
cafHexGridIntersectionTools/cafHexGridIntersectionTools.h cafHexGridIntersectionTools/cafHexGridIntersectionTools.h
cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp)
)
target_include_directories(${PROJECT_NAME} target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(
LibCore ${PROJECT_NAME}
LibGeometry LibCore
LibViewing LibGeometry
LibRender LibViewing
LibGuiQt LibRender
LibGuiQt
CommonCode CommonCode
${QT_LIBRARIES})
${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

41
Fwk/AppFwk/cafVizExtensions/cafHexGridIntersectionTools/cafHexGridIntersectionTools_UnitTest/CMakeLists.txt
View File

@@ -1,36 +1,31 @@
cmake_minimum_required (VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project ( cafHexGridIntersectionTools_UnitTests ) project(cafHexGridIntersectionTools_UnitTests)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 # VS 2017 : Disable warnings from from gtest code, using deprecated code
# related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") message(
STATUS
"Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
)
endif() endif()
set (VIZ_MODULES_FOLDER_NAME ../../../../../Fwk/VizFwk) set(VIZ_MODULES_FOLDER_NAME ../../../../../Fwk/VizFwk)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore LibCoreDir}) add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore LibCoreDir})
include_directories ( include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
) )
set( PROJECT_FILES set(PROJECT_FILES
cafHexGridIntersectionToolsBasicTests.cpp cafHexGridIntersectionToolsBasicTests.cpp
cafHexGridIntersectionTools_UnitTests_main.cpp cafHexGridIntersectionTools_UnitTests_main.cpp
../cafHexGridIntersectionTools.cpp ../cafHexGridIntersectionTools.cpp ../cafHexGridIntersectionTools.h)
../cafHexGridIntersectionTools.h
)
# add the executable # add the executable
add_executable (${PROJECT_NAME} add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
${PROJECT_FILES}
gtest/gtest-all.cpp
)
target_link_libraries ( ${PROJECT_NAME} target_link_libraries(${PROJECT_NAME} LibCore)
LibCore
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})