Fixes by cmake-format (#6874)

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

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)
# 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
cafPdmCodeGenerator.h
cafPdmAbstractFieldScriptingCapability.h
cafPdmAbstractFieldScriptingCapability.cpp
cafPdmFieldScriptingCapability.h
cafPdmFieldScriptingCapability.cpp
cafPdmObjectMethod.h
cafPdmObjectMethod.cpp
cafPdmObjectScriptingCapabilityRegister.h
cafPdmObjectScriptingCapabilityRegister.cpp
cafPdmPythonGenerator.h
cafPdmPythonGenerator.cpp
cafPdmScriptIOMessages.h
cafPdmScriptIOMessages.cpp
cafPdmObjectScriptingCapability.h
cafPdmObjectScriptingCapability.cpp
cafPdmScriptResponse.h
cafPdmScriptResponse.cpp
cafPdmMarkdownGenerator.h
cafPdmMarkdownGenerator.cpp
cafPdmMarkdownBuilder.h
cafPdmMarkdownBuilder.cpp
)
set(PROJECT_FILES
cafPdmCodeGenerator.h
cafPdmAbstractFieldScriptingCapability.h
cafPdmAbstractFieldScriptingCapability.cpp
cafPdmFieldScriptingCapability.h
cafPdmFieldScriptingCapability.cpp
cafPdmObjectMethod.h
cafPdmObjectMethod.cpp
cafPdmObjectScriptingCapabilityRegister.h
cafPdmObjectScriptingCapabilityRegister.cpp
cafPdmPythonGenerator.h
cafPdmPythonGenerator.cpp
cafPdmScriptIOMessages.h
cafPdmScriptIOMessages.cpp
cafPdmObjectScriptingCapability.h
cafPdmObjectScriptingCapability.cpp
cafPdmScriptResponse.h
cafPdmScriptResponse.cpp
cafPdmMarkdownGenerator.h
cafPdmMarkdownGenerator.cpp
cafPdmMarkdownBuilder.h
cafPdmMarkdownBuilder.cpp)
set (CAF_LIBS cafProjectDataModel)
set(CAF_LIBS cafProjectDataModel)
if (CAF_CVF_SCRIPTING)
list(APPEND PROJECT_FILES
cafPdmFieldScriptingCapabilityCvfColor3.h
cafPdmFieldScriptingCapabilityCvfColor3.cpp
cafPdmFieldScriptingCapabilityCvfVec3d.h
cafPdmFieldScriptingCapabilityCvfVec3d.cpp
)
list(APPEND CAF_LIBS cafPdmCvf)
if(CAF_CVF_SCRIPTING)
list(
APPEND
PROJECT_FILES
cafPdmFieldScriptingCapabilityCvfColor3.h
cafPdmFieldScriptingCapabilityCvfColor3.cpp
cafPdmFieldScriptingCapabilityCvfVec3d.h
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})

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 the executable
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}>
)
endforeach(qtlib)
endif(Qt5Core_FOUND)
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)