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

753
ApplicationCode/CMakeLists.txt
View File

File diff suppressed because it is too large Load Diff

51
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
if (RESINSIGHT_ENABLE_UNITY_BUILD)
if(RESINSIGHT_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
set( COMMAND_REFERENCED_CMAKE_FILES
set(COMMAND_REFERENCED_CMAKE_FILES
CMakeLists_files.cmake
AnalysisPlotCommands/CMakeLists_files.cmake
ApplicationCommands/CMakeLists_files.cmake
@@ -37,38 +37,33 @@ set( COMMAND_REFERENCED_CMAKE_FILES
WellLogCommands/CMakeLists_files.cmake
WellPathCommands/CMakeLists_files.cmake
PlotTemplateCommands/CMakeLists_files.cmake
FractureCommands/CMakeLists_files.cmake
)
FractureCommands/CMakeLists_files.cmake)
# Include source file lists from *.cmake files
foreach (referencedfile ${COMMAND_REFERENCED_CMAKE_FILES})
include (${referencedfile})
endforeach (referencedfile)
foreach(referencedfile ${COMMAND_REFERENCED_CMAKE_FILES})
include(${referencedfile})
endforeach(referencedfile)
find_package(Eigen3 REQUIRED)
# 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
${COMMAND_CODE_SOURCE_FILES}
${COMMAND_CODE_HEADER_FILES}
${COMMAND_MOC_SOURCE_FILES}
)
add_library(
${PROJECT_NAME} OBJECT
${COMMAND_CODE_SOURCE_FILES} ${COMMAND_CODE_HEADER_FILES}
${COMMAND_MOC_SOURCE_FILES})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/ThirdParty
)
target_include_directories(
${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/ThirdParty)
# Before cmake 3.12 OBJECT libraries could not use the target_link_libraries command,
# So we need to set the POSITION_INDEPENDENT_CODE option manually
# Before cmake 3.12 OBJECT libraries could not use the target_link_libraries
# command, So we need to set the POSITION_INDEPENDENT_CODE option manually
set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
# Use this code when 3.12 can be used as minimum version of cmake
set( LINK_LIBRARIES
set(LINK_LIBRARIES
LibCore
cafCommand
cafPdmCvf
@@ -79,13 +74,9 @@ set( LINK_LIBRARIES
ecl
nightcharts
qwt
${QT_LIBRARIES}
Eigen3::Eigen
)
Eigen3::Eigen)
target_link_libraries( ${PROJECT_NAME}
${LINK_LIBRARIES}
)
target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES})
source_group("" FILES ${PROJECT_FILES})

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

@@ -1,14 +1,15 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required(VERSION 3.12)
project (RigGeoMechDataModel)
project(RigGeoMechDataModel)
# Unity Build
if (RESINSIGHT_ENABLE_UNITY_BUILD)
if(RESINSIGHT_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
add_library( ${PROJECT_NAME}
add_library(
${PROJECT_NAME}
RigFemPart.h
RigFemPart.cpp
RigFemTypes.h
@@ -103,27 +104,13 @@ add_library( ${PROJECT_NAME}
RigFemPartResultCalculatorShearSlipIndicator.h
RigFemPartResultCalculatorShearSlipIndicator.cpp
RimGeoMechGeometrySelectionItem.h
RimGeoMechGeometrySelectionItem.cpp
)
RimGeoMechGeometrySelectionItem.cpp)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
set( LINK_LIBRARIES
LibCore
set(LINK_LIBRARIES LibCore cafPdmCvf cafTensor cafUserInterface CommonCode
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})

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

@@ -1,14 +1,14 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required(VERSION 3.12)
project (RifOdbReader)
project(RifOdbReader)
# Unity Build
if (RESINSIGHT_ENABLE_UNITY_BUILD)
if(RESINSIGHT_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
if (MSVC)
if(MSVC)
add_definitions(-DHKS_NT)
add_definitions(-DABQ_WIN86_64)
else()
@@ -40,20 +40,16 @@ else()
add_definitions(-DABQ_MPI_PMPI)
endif(MSVC)
include_directories(
${RESINSIGHT_ODB_API_DIR}/include
)
include_directories(${RESINSIGHT_ODB_API_DIR}/include)
add_library( ${PROJECT_NAME}
RifOdbReader.h
RifOdbReader.cpp
RifGeoMechReaderInterface.h
RifGeoMechReaderInterface.cpp
OdbSetup.cmake
)
add_library(
${PROJECT_NAME} RifOdbReader.h RifOdbReader.cpp RifGeoMechReaderInterface.h
RifGeoMechReaderInterface.cpp OdbSetup.cmake)
if (MSVC)
list(APPEND RI_ODB_LIBS
if(MSVC)
list(
APPEND
RI_ODB_LIBS
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbDdbOdb.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbApi.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAOdbCore.lib
@@ -68,10 +64,11 @@ if (MSVC)
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMARomDiagEx.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASspUmaCore.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMASimInterface.lib
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAMtxCoreModule.lib
)
${RESINSIGHT_ODB_API_DIR}/lib/ABQSMAMtxCoreModule.lib)
else()
list(APPEND RI_ODB_LIBS
list(
APPEND
RI_ODB_LIBS
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbDdbOdb.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbApi.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAOdbCore.so
@@ -86,15 +83,12 @@ else()
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMARomDiagEx.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASspUmaCore.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMASimInterface.so
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAMtxCoreModule.so
)
${RESINSIGHT_ODB_API_DIR}/lib/libABQSMAMtxCoreModule.so)
endif(MSVC)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} 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})

29
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_GTEST_ROOT ../../../ThirdParty CACHE PATH "Path to folder containing gtest folder")
set(RI_TEST_FILE "" CACHE FILEPATH "Path to test file")
set(RI_VIZ_FWK_ROOT
../../../Fwk/VizFwk
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)
@@ -13,7 +19,7 @@ add_subdirectory(../../ResultStatisticsCache buildResultStatisticsCache)
add_subdirectory(../OdbReader buildOdbReader)
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(../../ResultStatisticsCache)
@@ -22,13 +28,10 @@ include_directories(../OdbReader)
include_directories(../GeoMechDataModel)
include_directories(${RI_GTEST_ROOT})
set( UNIT_TEST_CPP_SOURCES
main.cpp
RifOdbReader-Test.cpp
${RI_GTEST_ROOT}/gtest/gtest-all.cc
)
set(UNIT_TEST_CPP_SOURCES main.cpp RifOdbReader-Test.cpp
${RI_GTEST_ROOT}/gtest/gtest-all.cc)
add_executable( ${PROJECT_NAME} ${UNIT_TEST_CPP_SOURCES} )
target_link_libraries( ${PROJECT_NAME} RifOdbReader)
add_executable(${PROJECT_NAME} ${UNIT_TEST_CPP_SOURCES})
target_link_libraries(${PROJECT_NAME} RifOdbReader)
include(../OdbReader/OdbSetup.cmake)

203
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")
add_definitions(-DENABLE_GRPC)
if (VCPKG_AUTO_INSTALL)
if(VCPKG_AUTO_INSTALL)
vcpkg_install(grpc)
endif()
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)
endif()
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}/RiaGrpcHelper.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}/RiaGrpcPropertiesService.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}/RiaGrpcHelper.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}/RiaGrpcPropertiesService.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcNNCPropertiesService.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPdmObjectService.cpp
)
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcPdmObjectService.cpp)
# Find Protobuf installation
# Looks for protobuf-config.cmake file installed by Protobuf's cmake installation.
# Find Protobuf installation Looks for protobuf-config.cmake file installed by
# Protobuf's cmake installation.
set(protobuf_MODULE_COMPATIBLE ON)
find_package(Protobuf CONFIG 3.0 QUIET)
if (Protobuf_FOUND)
if(Protobuf_FOUND)
message(STATUS "Using protobuf ${protobuf_VERSION}")
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()
# Find gRPC installation
# Looks for gRPCConfig.cmake file installed by gRPC's cmake installation.
# Find gRPC installation Looks for gRPCConfig.cmake file installed by gRPC's
# cmake installation.
find_package(gRPC CONFIG REQUIRED)
message(STATUS "Using gRPC ${gRPC_VERSION}")
@@ -72,12 +77,11 @@ 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_LIBRARIES ${_GRPC_GRPCPP_UNSECURE} ${_PROTOBUF_LIBPROTOBUF})
set_target_properties(${GRPC_LIBRARIES} PROPERTIES
MAP_IMPORTED_CONFIG_MINSIZEREL RELEASE
MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE
)
set_target_properties(
${GRPC_LIBRARIES} PROPERTIES MAP_IMPORTED_CONFIG_MINSIZEREL RELEASE
MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE)
set( LINK_LIBRARIES
set(LINK_LIBRARIES
${QT_LIBRARIES}
${GRPC_LIBRARIES}
LibCore
@@ -89,8 +93,7 @@ set( LINK_LIBRARIES
cafVizExtensions
ecl
nightcharts
qwt
)
qwt)
# Proto files
set(PROTO_FILES
@@ -103,15 +106,16 @@ set(PROTO_FILES
"NNCProperties"
"App"
"Properties"
"Grid"
)
"Grid")
set(GRPC_PYTHON_SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}/Python")
add_custom_target(PipInstall)
foreach(proto_file ${PROTO_FILES})
get_filename_component(rips_proto "${CMAKE_CURRENT_LIST_DIR}/GrpcProtos/${proto_file}.proto" ABSOLUTE)
get_filename_component(
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})
@@ -122,61 +126,56 @@ foreach(proto_file ${PROTO_FILES})
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}"
)
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}")
if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
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}"
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}
)
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")
message(
STATUS
"RESINSIGHT_GRPC_PYTHON_EXECUTABLE not specified. Will not install Python client code"
)
endif()
list( APPEND GRPC_HEADER_FILES
${rips_proto_hdrs}
${rips_grpc_hdrs}
)
list(APPEND GRPC_HEADER_FILES ${rips_proto_hdrs} ${rips_grpc_hdrs})
list( APPEND GRPC_CPP_SOURCES
${rips_proto_srcs}
${rips_grpc_srcs}
)
list(APPEND GRPC_CPP_SOURCES ${rips_proto_srcs} ${rips_grpc_srcs})
endforeach(proto_file)
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.py.cmake
if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
configure_file(${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.py.cmake
${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)
endif()
list(APPEND GRPC_PYTHON_SOURCES
list(
APPEND
GRPC_PYTHON_SOURCES
"rips/generated/RiaVersionInfo.py"
"rips/__init__.py"
"rips/case.py"
@@ -226,71 +225,79 @@ list(APPEND GRPC_PYTHON_SOURCES
"requirements.txt"
"setup.py"
"README.md"
"LICENSE"
)
"LICENSE")
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})
list(APPEND GRPC_PYTHON_SOURCES_FULL_PATH "${GRPC_PYTHON_SOURCE_PATH}/${PYTHON_SCRIPT}")
list(APPEND GRPC_PYTHON_SOURCES_FULL_PATH
"${GRPC_PYTHON_SOURCE_PATH}/${PYTHON_SCRIPT}")
endforeach()
endif()
add_library( ${PROJECT_NAME} OBJECT
${SOURCE_GROUP_HEADER_FILES}
${SOURCE_GROUP_SOURCE_FILES}
${GRPC_HEADER_FILES}
${GRPC_CPP_SOURCES}
)
add_library(
${PROJECT_NAME} OBJECT
${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
${GRPC_HEADER_FILES} ${GRPC_CPP_SOURCES})
target_link_libraries( ${PROJECT_NAME}
${LINK_LIBRARIES}
)
target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARIES})
if (MSVC)
if(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()
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-Wno-overloaded-virtual")
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"-Wno-overloaded-virtual")
endif()
# 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")
add_custom_command(
TARGET PipInstall
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --upgrade pip
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
)
COMMAND ${RESINSIGHT_GRPC_PYTHON_EXECUTABLE} ARGS -m pip install --upgrade
pip
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()
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")
add_custom_command(
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()
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
add_custom_target(GeneratedPythonSources ALL DEPENDS ${GRPC_PYTHON_SOURCES_FULL_PATH})
if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
add_custom_target(GeneratedPythonSources ALL
DEPENDS ${GRPC_PYTHON_SOURCES_FULL_PATH})
add_dependencies(${PROJECT_NAME} GeneratedPythonSources)
if (RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE)
if(RESINSIGHT_GRPC_DOWNLOAD_PYTHON_MODULE)
add_dependencies(${PROJECT_NAME} PipInstall)
add_dependencies(GeneratedPythonSources PipInstall)
endif()
endif()
if (RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
install(DIRECTORY ${GRPC_PYTHON_SOURCE_PATH}/ DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/Python)
if(RESINSIGHT_GRPC_PYTHON_EXECUTABLE)
install(DIRECTORY ${GRPC_PYTHON_SOURCE_PATH}/
DESTINATION ${RESINSIGHT_INSTALL_FOLDER}/Python)
endif()
source_group( "GrpcInterface" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${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")
source_group(
"GrpcInterface"
FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
${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()

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(
${LibCore_SOURCE_DIR}
)
include_directories(${LibCore_SOURCE_DIR})
add_library( ${PROJECT_NAME}
RigStatisticsCalculator.h
RigStatisticsCalculator.cpp
RigStatisticsDataCache.h
RigStatisticsDataCache.cpp
RigStatisticsMath.h
RigStatisticsMath.cpp
)
add_library(
${PROJECT_NAME}
RigStatisticsCalculator.h RigStatisticsCalculator.cpp
RigStatisticsDataCache.h RigStatisticsDataCache.cpp RigStatisticsMath.h
RigStatisticsMath.cpp)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME} LibCore)

72
Fwk/AppFwk/CMakeLists.txt
View File

@@ -1,27 +1,36 @@
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))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
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
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()
# Qt
if (NOT DEFINED(CEE_USE_QT5))
if(NOT DEFINED (CEE_USE_QT5))
option(CEE_USE_QT5 "Use Qt5" ON)
endif(NOT DEFINED(CEE_USE_QT5))
endif(NOT DEFINED (CEE_USE_QT5))
if (CEE_USE_QT5)
find_package(Qt5 COMPONENTS REQUIRED Core Gui OpenGL Widgets)
if(CEE_USE_QT5)
find_package(
Qt5
COMPONENTS
REQUIRED Core Gui OpenGL Widgets)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::OpenGL Qt5::Widgets)
else()
find_package(Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl REQUIRED)
find_package(
Qt4
COMPONENTS QtCore QtGui QtMain QtOpenGl
REQUIRED)
include(${QT_USE_FILE})
endif(CEE_USE_QT5)
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_CXX_FLAGS "-std=c++0x")
endif()
@@ -29,19 +38,14 @@ if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif()
# Improvement Cmake 3.x If we have compiler requirements for this library, list
# them target_compile_features(lib PUBLIC cxx_auto_type PRIVATE
# cxx_variadic_templates)
# Improvement Cmake 3.x
# If we have compiler requirements for this library, list them
#target_compile_features(lib
# PUBLIC cxx_auto_type
# PRIVATE cxx_variadic_templates)
#libraries
add_subdirectory (cafProjectDataModel/cafPdmCore)
add_subdirectory (cafProjectDataModel/cafPdmUiCore)
add_subdirectory (cafProjectDataModel/cafPdmXml)
# libraries
add_subdirectory(cafProjectDataModel/cafPdmCore)
add_subdirectory(cafProjectDataModel/cafPdmUiCore)
add_subdirectory(cafProjectDataModel/cafPdmXml)
add_subdirectory(cafProjectDataModel)
add_subdirectory(cafCommand)
@@ -49,22 +53,22 @@ add_subdirectory(cafCommandFeatures)
add_subdirectory(cafUserInterface)
add_subdirectory(cafPdmScripting)
#executables
# executables
add_subdirectory(cafTests/cafTestApplication)
if( UNIX )
if(UNIX)
set(THREAD_LIBRARY "pthread")
endif()
add_subdirectory (cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests)
add_subdirectory (cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests)
add_subdirectory (cafProjectDataModel/cafProjectDataModel_UnitTests)
add_subdirectory (cafUserInterface/cafUserInterface_UnitTests)
add_subdirectory (cafPdmScripting/cafPdmScripting_UnitTests)
add_subdirectory(cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests)
add_subdirectory(cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests)
add_subdirectory(cafProjectDataModel/cafProjectDataModel_UnitTests)
add_subdirectory(cafUserInterface/cafUserInterface_UnitTests)
add_subdirectory(cafPdmScripting/cafPdmScripting_UnitTests)
# Organize sub-projects into folders on Visual Studio
# Turn on using solution folders
# Organize sub-projects into folders on Visual Studio Turn on using solution
# folders
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")

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

@@ -1,28 +1,30 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required(VERSION 3.12)
project (CommonCode)
project(CommonCode)
# Unity Build
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
# Open GL
find_package( OpenGL )
find_package(OpenGL)
# Qt
# These headers need to go through Qt's MOC compiler
set( MOC_HEADER_FILES
cafMessagePanel.h
)
set(MOC_HEADER_FILES 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)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_library( ${PROJECT_NAME}
add_library(
${PROJECT_NAME}
cafEffectCache.cpp
cafEffectCache.h
cafEffectGenerator.cpp
@@ -43,35 +45,28 @@ add_library( ${PROJECT_NAME}
cafColorTable.h
cafContourLines.cpp
cafContourLines.h
cvfStructGridGeometryGenerator.cpp
cvfStructGridGeometryGenerator.h
cvfStructGridScalarDataAccess.h
cafVecIjk.cpp
cafVecIjk.h
${MOC_SOURCE_FILES})
${MOC_SOURCE_FILES}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
target_link_libraries(
${PROJECT_NAME}
LibCore
LibGeometry
LibViewing
LibRender
LibGuiQt
cafPdmCore
${QT_LIBRARIES})
${QT_LIBRARIES}
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES})

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

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

48
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
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
# These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES
cafCmdFeature.h
cafCmdFeatureManager.h
)
set(MOC_HEADER_FILES cafCmdFeature.h cafCmdFeatureManager.h)
# 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)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
set( PROJECT_FILES
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
set(PROJECT_FILES
cafCmdExecCommandManager.cpp
cafCmdExecCommandManager.h
cafCmdExecuteCommand.h
cafCmdUiCommandSystemImpl.h
cafCmdUiCommandSystemImpl.cpp
cafCmdFieldChangeExec.cpp
cafCmdFieldChangeExec.h
cafCmdSelectionHelper.cpp
cafCmdSelectionHelper.h
cafCmdSelectionChangeExec.cpp
cafCmdSelectionChangeExec.h
cafCmdFeature.cpp
cafCmdFeature.h
cafCmdFeatureManager.cpp
cafCmdFeatureManager.h
cafCmdFeatureMenuBuilder.cpp
cafCmdFeatureMenuBuilder.h
)
cafCmdFeatureMenuBuilder.h)
add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
${MOC_SOURCE_FILES}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES})
target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel
${QT_LIBRARIES}
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES})

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

35
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))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
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
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()
set (VIZ_MODULES_FOLDER_NAME ../../../../Fwk/VizFwk)
set(VIZ_MODULES_FOLDER_NAME ../../../../Fwk/VizFwk)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore LibCoreDir})
include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
)
set( PROJECT_FILES
cafHexInterpolatorBasicTest.cpp
cafHexInterpolator_UnitTests_main.cpp
)
set(PROJECT_FILES cafHexInterpolatorBasicTest.cpp
cafHexInterpolator_UnitTests_main.cpp)
# add the executable
add_executable (${PROJECT_NAME}
${PROJECT_FILES}
gtest/gtest-all.cpp
)
add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
target_link_libraries ( ${PROJECT_NAME}
LibCore
)
target_link_libraries(${PROJECT_NAME} LibCore)
source_group("" FILES ${PROJECT_FILES})

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

@@ -1,21 +1,25 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required(VERSION 3.12)
project (cafPdmCvf)
project(cafPdmCvf)
# Unity Build
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
# 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)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_definitions(-DCVF_USING_CMAKE)
add_library( ${PROJECT_NAME}
add_library(
${PROJECT_NAME}
cafPdmCoreColor3f.h
cafPdmUiCoreColor3f.cpp
cafPdmUiCoreColor3f.h
@@ -28,34 +32,24 @@ add_library( ${PROJECT_NAME}
cafPdmXmlVec3d.cpp
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}
)
${MOC_SOURCE_FILES})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cafPdmMat3d
)
target_include_directories(
${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cafPdmMat3d)
target_link_libraries ( ${PROJECT_NAME}
cafUserInterface
LibCore
${QT_LIBRARIES}
)
target_link_libraries(${PROJECT_NAME} cafUserInterface LibCore ${QT_LIBRARIES})
source_group("" FILES ${PROJECT_FILES})

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

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

@@ -1,16 +1,16 @@
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)
# Unity Build
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
set( PROJECT_FILES
set(PROJECT_FILES
cafPdmCodeGenerator.h
cafPdmAbstractFieldScriptingCapability.h
cafPdmAbstractFieldScriptingCapability.cpp
@@ -31,37 +31,25 @@ set( PROJECT_FILES
cafPdmMarkdownGenerator.h
cafPdmMarkdownGenerator.cpp
cafPdmMarkdownBuilder.h
cafPdmMarkdownBuilder.cpp
)
cafPdmMarkdownBuilder.cpp)
set (CAF_LIBS cafProjectDataModel)
set(CAF_LIBS cafProjectDataModel)
if (CAF_CVF_SCRIPTING)
list(APPEND PROJECT_FILES
if(CAF_CVF_SCRIPTING)
list(
APPEND
PROJECT_FILES
cafPdmFieldScriptingCapabilityCvfColor3.h
cafPdmFieldScriptingCapabilityCvfColor3.cpp
cafPdmFieldScriptingCapabilityCvfVec3d.h
cafPdmFieldScriptingCapabilityCvfVec3d.cpp
)
cafPdmFieldScriptingCapabilityCvfVec3d.cpp)
list(APPEND CAF_LIBS cafPdmCvf)
endif()
add_library(${PROJECT_NAME} ${PROJECT_FILES})
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
${CAF_LIBS}
)
target_link_libraries(${PROJECT_NAME} ${CAF_LIBS})
source_group("" FILES ${PROJECT_FILES})

49
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)
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
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
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()
include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
)
# add the executable
add_executable (${PROJECT_NAME}
cafPdmScripting_UnitTests.cpp
gtest/gtest-all.cpp
add_executable(${PROJECT_NAME} cafPdmScripting_UnitTests.cpp
gtest/gtest-all.cpp cafPdmScriptingBasicTest.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})
# Copy Qt Dlls
if (Qt5Core_FOUND)
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
if(Qt5Core_FOUND)
foreach(qtlib ${QT_LIBRARIES})
add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)
endif(Qt5Core_FOUND)

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

@@ -1,18 +1,21 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required(VERSION 3.12)
project (cafProjectDataModel)
project(cafProjectDataModel)
# Unity Build
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
# 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( PROJECT_FILES
set(PROJECT_FILES
cafFactory.h
cafOmpMutex.h
cafPdmDocument.cpp
@@ -20,26 +23,17 @@ set( PROJECT_FILES
cafPdmObjectGroup.cpp
cafPdmObjectGroup.h
cafPdmObject.cpp
cafPdmObject.h
)
cafPdmObject.h)
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
add_library(${PROJECT_NAME} ${PROJECT_FILES})
target_link_libraries ( ${PROJECT_NAME}
cafPdmUiCore
cafPdmXml
${QT_LIBRARIES}
)
target_link_libraries(${PROJECT_NAME} cafPdmUiCore cafPdmXml ${QT_LIBRARIES})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES})

34
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
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
find_package(Qt5 COMPONENTS REQUIRED Core)
find_package(
Qt5
COMPONENTS
REQUIRED Core)
set(QT_LIBRARIES Qt5::Core)
set( PROJECT_FILES
set(PROJECT_FILES
cafAssert.h
cafAppEnum.h
cafClassTypeName.h
@@ -45,13 +47,10 @@ set( PROJECT_FILES
cafPdmUiFieldHandleInterface.h
cafPdmValueField.h
cafInternalPdmValueFieldSpecializations.h
cafNotificationCenter.cpp
cafNotificationCenter.h
cafSignal.h
cafSignal.cpp
cafTristate.cpp
cafTristate.h
cafFilePath.cpp
@@ -59,22 +58,17 @@ set( PROJECT_FILES
cafAsyncObjectDeleter.h
cafAsyncObjectDeleter.inl
cafAsyncWorkerManager.h
cafAsyncWorkerManager.cpp
)
cafAsyncWorkerManager.cpp)
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
add_library(${PROJECT_NAME} ${PROJECT_FILES})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES})

55
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
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)
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
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
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()
include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
)
set( PROJECT_FILES
set(PROJECT_FILES
cafPdmCore_UnitTests.cpp
gtest/gtest-all.cpp
cafPdmCoreBasicTest.cpp
cafPdmReferenceHelperTest.cpp
cafPdmChildArrayFieldHandleTest.cpp
cafSignalTest.cpp
Child.cpp
Child.h
Parent.cpp
Parent.h
TestObj.cpp
TestObj.h
)
TestObj.h)
# add the executable
add_executable (${PROJECT_NAME}
${PROJECT_FILES}
)
add_executable(${PROJECT_NAME} ${PROJECT_FILES})
source_group("" FILES ${PROJECT_FILES})
if (Qt5Core_FOUND)
if(Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
endif()
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES}
${THREAD_LIBRARY})
# Copy Qt Dlls
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
foreach(qtlib ${QT_LIBRARIES})
add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)

73
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
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
# These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES
cafPdmUiEditorHandle.h
cafPdmUiFieldEditorHandle.h
cafPdmUiSelection3dEditorVisualizer.h
cafQShortenedLabel.h
)
set(MOC_HEADER_FILES cafPdmUiEditorHandle.h cafPdmUiFieldEditorHandle.h
cafPdmUiSelection3dEditorVisualizer.h cafQShortenedLabel.h)
# 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)
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)
set( PROJECT_FILES
set(PROJECT_FILES
cafInternalPdmFieldTypeSpecializations.h
cafInternalPdmUiFieldCapability.h
cafInternalPdmUiFieldCapability.inl
cafInternalPdmUiCommandSystemInterface.h
cafPdmUiEditorHandle.cpp
cafPdmUiEditorHandle.h
cafPdmUiFieldEditorHandle.cpp
@@ -62,7 +57,6 @@ set( PROJECT_FILES
cafUiTreeItem.h
cafPdmUiGroup.cpp
cafPdmUiGroup.h
cafSelectionManager.cpp
cafSelectionManager.h
cafSelectionChangedReceiver.h
@@ -75,41 +69,28 @@ set( PROJECT_FILES
cafIconProvider.cpp
cafIconProvider.h
cafFontTools.cpp
cafFontTools.h
)
cafFontTools.h)
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent scope
# CMakeList.txt in the application folder (parent scope) must use the following syntax
# to make sure the QRC_FILES variable contains appended files in subfolders
# NOTE! Resources in this subfolder appends to the variable QRC_FILES in parent
# scope CMakeList.txt in the application folder (parent scope) must use the
# following syntax to make sure the QRC_FILES variable contains appended files
# in subfolders
# set( QRC_FILES
# ${QRC_FILES}
# Resources/MyaApplication.qrc
# )
# set( QRC_FILES ${QRC_FILES} Resources/MyaApplication.qrc )
set( QRC_FILES
${QRC_FILES}
${CMAKE_CURRENT_SOURCE_DIR}/Resources/caf.qrc
PARENT_SCOPE
)
set(QRC_FILES
${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/caf.qrc
PARENT_SCOPE)
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
${MOC_SOURCE_FILES}
)
add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore
${QT_LIBRARIES}
)
target_link_libraries(${PROJECT_NAME} cafPdmCore ${QT_LIBRARIES})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES})

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

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

56
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)
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
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
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()
include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
)
# add the executable
add_executable (${PROJECT_NAME}
cafPdmXml_UnitTests.cpp
gtest/gtest-all.cpp
add_executable(
${PROJECT_NAME}
cafPdmXml_UnitTests.cpp gtest/gtest-all.cpp cafPdmXmlBasicTest.cpp
cafPdmAdvancedTemplateTest.cpp cafPdmXmlNumberTest.cpp cafPdmPtrArrayTest.cpp)
cafPdmXmlBasicTest.cpp
cafPdmAdvancedTemplateTest.cpp
cafPdmXmlNumberTest.cpp
cafPdmPtrArrayTest.cpp
)
if (Qt5Core_FOUND)
if(Qt5Core_FOUND)
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
endif()
target_link_libraries ( ${PROJECT_NAME}
cafPdmXml
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
target_link_libraries(${PROJECT_NAME} cafPdmXml ${QT_LIBRARIES}
${THREAD_LIBRARY})
source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls
if (Qt5Core_FOUND)
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
if(Qt5Core_FOUND)
foreach(qtlib ${QT_LIBRARIES})
add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)
endif(Qt5Core_FOUND)

53
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
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)
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
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
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()
include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
)
set( PROJECT_FILES
cafPdmBasicTest.cpp
cafProjectDataModel_UnitTests.cpp
Child.cpp
Parent.cpp
TestObj.cpp
)
set(PROJECT_FILES cafPdmBasicTest.cpp cafProjectDataModel_UnitTests.cpp
Child.cpp Parent.cpp TestObj.cpp)
# add the executable
add_executable (${PROJECT_NAME}
${PROJECT_FILES}
gtest/gtest-all.cpp
)
add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel
${QT_LIBRARIES}
${THREAD_LIBRARY}
)
target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES}
${THREAD_LIBRARY})
source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
foreach(qtlib ${QT_LIBRARIES})
add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
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
cafTensor3.cpp
cafTensor3.h
cafTensor3.inl
)
set(PROJECT_FILES cafTensor3.cpp cafTensor3.h cafTensor3.inl)
add_library(${PROJECT_NAME} ${PROJECT_FILES})
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries( ${PROJECT_NAME} LibCore )
target_link_libraries(${PROJECT_NAME} LibCore)
source_group("" FILES ${PROJECT_FILES})

92
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
find_package( OpenGL )
find_package(OpenGL)
# Qt
# Qt MOC
set (MOC_HEADER_FILES
MainWindow.h
WidgetLayoutTest.h
CustomObjectEditor.h
MenuItemProducer.h
)
set(MOC_HEADER_FILES MainWindow.h WidgetLayoutTest.h CustomObjectEditor.h
MenuItemProducer.h)
# Resource file
set( QRC_FILES
${QRC_FILES}
textedit.qrc
)
set(QRC_FILES ${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)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_add_resources( QRC_FILES_CPP ${QRC_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
qt5_add_resources(QRC_FILES_CPP ${QRC_FILES})
option(USE_COMMAND_FRAMEWORK "Use Caf Command Framework" ON)
if (USE_COMMAND_FRAMEWORK)
include_directories (
${cafCommand_SOURCE_DIR}
)
ADD_DEFINITIONS(-DTAP_USE_COMMAND_FRAMEWORK)
if(USE_COMMAND_FRAMEWORK)
include_directories(${cafCommand_SOURCE_DIR})
add_definitions(-DTAP_USE_COMMAND_FRAMEWORK)
endif(USE_COMMAND_FRAMEWORK)
set( PROJECT_FILES
set(PROJECT_FILES
Main.cpp
MainWindow.cpp
MainWindow.h
@@ -48,50 +41,45 @@ set( PROJECT_FILES
CustomObjectEditor.h
MenuItemProducer.cpp
MenuItemProducer.h
TamComboBox.h
TamComboBox.cpp
)
TamComboBox.cpp)
# add the executable
add_executable ( ${PROJECT_NAME}
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
$<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
)
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
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)
# According to ivarun this is needed on OpenSuse, and Fedora. See: https://github.com/OPM/ResInsight/pull/7
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
list(APPEND EXTERNAL_LINK_LIBRARIES
rt
pthread
)
# According to ivarun this is needed on OpenSuse, and Fedora. See:
# https://github.com/OPM/ResInsight/pull/7
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
list(APPEND EXTERNAL_LINK_LIBRARIES rt pthread)
endif()
target_link_libraries ( ${PROJECT_NAME}
${TAP_LINK_LIBRARIES}
${QT_LIBRARIES}
${EXTERNAL_LINK_LIBRARIES}
)
target_link_libraries(${PROJECT_NAME} ${TAP_LINK_LIBRARIES} ${QT_LIBRARIES}
${EXTERNAL_LINK_LIBRARIES})
source_group("" FILES ${PROJECT_FILES})
foreach (qtlib ${QT_LIBRARIES})
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}> $<TARGET_FILE_DIR:${PROJECT_NAME}>
)
foreach(qtlib ${QT_LIBRARIES})
add_custom_command(
TARGET ${PROJECT_NAME}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
endforeach(qtlib)

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

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

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

@@ -1,20 +1,20 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required(VERSION 3.12)
project (cafUserInterface)
project(cafUserInterface)
# Unity Build
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
if (MSVC)
if(MSVC)
# Define this one to tell windows.h to not define min() and max() as macros
add_definitions(-DNOMINMAX)
endif (MSVC)
endif(MSVC)
# These headers need to go through Qt's MOC compiler
set (MOC_HEADER_FILES
set(MOC_HEADER_FILES
cafPdmUiCheckBoxDelegate.h
cafPdmUiCheckBoxEditor.h
cafPdmUiCheckBoxTristateEditor.h
@@ -52,15 +52,16 @@ set (MOC_HEADER_FILES
cafPdmUniqueIdValidator.h
cafPdmDoubleStringValidator.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)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
set( PROJECT_FILES
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
set(PROJECT_FILES
# field editors
cafPdmUiCheckBoxDelegate.cpp
cafPdmUiCheckBoxDelegate.h
@@ -104,8 +105,6 @@ set( PROJECT_FILES
cafPdmUiFieldEditorHelper.h
cafPdmUiFieldEditorHelper.cpp
cafPdmUiLabelEditor.cpp
# object editors
cafPdmUiDefaultObjectEditor.cpp
cafPdmUiDefaultObjectEditor.h
@@ -141,8 +140,6 @@ set( PROJECT_FILES
cafPdmUiFormLayoutObjectEditor.h
cafPdmUiDoubleValueEditor.cpp
cafPdmUiDoubleValueEditor.h
# div
cafAboutDialog.cpp
cafAboutDialog.h
@@ -165,27 +162,18 @@ set( PROJECT_FILES
cafStyleSheetTools.h
cafStyleSheetTools.cpp
cafPdmUiTabbedPropertyViewDialog.h
cafPdmUiTabbedPropertyViewDialog.cpp
)
cafPdmUiTabbedPropertyViewDialog.cpp)
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
${MOC_SOURCE_FILES}
${QRC_FILES_CPP}
)
add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES}
${QRC_FILES_CPP})
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif()
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel
${QT_LIBRARIES}
)
target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES})
source_group("" FILES ${PROJECT_FILES})

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

42
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
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
@@ -11,15 +11,17 @@ endif()
# Qt
# These headers need to go through Qt's MOC compiler
set( MOC_HEADER_FILES
cafViewer.h
)
set(MOC_HEADER_FILES 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)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_library( ${PROJECT_NAME}
add_library(
${PROJECT_NAME}
cafCadNavigation.cpp
cafCadNavigation.h
cafCeetronNavigation.cpp
@@ -35,29 +37,23 @@ add_library( ${PROJECT_NAME}
cafOpenGLWidget.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}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
target_link_libraries(
${PROJECT_NAME}
LibCore
LibGeometry
LibViewing
LibRender
LibGuiQt
cafAnimControl
${QT_LIBRARIES})
${QT_LIBRARIES}
)
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
if(MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS
"/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES})

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

@@ -1,22 +1,26 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required(VERSION 3.12)
project (cafVizExtensions)
project(cafVizExtensions)
# Unity Build
if (CAF_ENABLE_UNITY_BUILD)
if(CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
set(CMAKE_UNITY_BUILD true)
endif()
# Open GL
find_package( OpenGL )
find_package(OpenGL)
# 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)
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} )
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
add_library( ${PROJECT_NAME}
add_library(
${PROJECT_NAME}
cafDisplayCoordTransform.cpp
cafDisplayCoordTransform.h
cafBoxManipulatorPartManager.cpp
@@ -44,26 +48,19 @@ add_library( ${PROJECT_NAME}
TranspWB_CombinationFrag.glsl
TranspWB_PartlyTranspPartsFrag.glsl
TranspWB_TransparentPartsFrag.glsl
cafHexGridIntersectionTools/cafHexGridIntersectionTools.h
cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
)
cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries ( ${PROJECT_NAME}
target_link_libraries(
${PROJECT_NAME}
LibCore
LibGeometry
LibViewing
LibRender
LibGuiQt
CommonCode
${QT_LIBRARIES}
)
${QT_LIBRARIES})
source_group("" FILES ${PROJECT_FILES})

35
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))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
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
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()
set (VIZ_MODULES_FOLDER_NAME ../../../../../Fwk/VizFwk)
set(VIZ_MODULES_FOLDER_NAME ../../../../../Fwk/VizFwk)
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore LibCoreDir})
include_directories (
${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
)
set( PROJECT_FILES
set(PROJECT_FILES
cafHexGridIntersectionToolsBasicTests.cpp
cafHexGridIntersectionTools_UnitTests_main.cpp
../cafHexGridIntersectionTools.cpp
../cafHexGridIntersectionTools.h
)
../cafHexGridIntersectionTools.cpp ../cafHexGridIntersectionTools.h)
# add the executable
add_executable (${PROJECT_NAME}
${PROJECT_FILES}
gtest/gtest-all.cpp
)
add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
target_link_libraries ( ${PROJECT_NAME}
LibCore
)
target_link_libraries(${PROJECT_NAME} LibCore)
source_group("" FILES ${PROJECT_FILES})