mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
cmake-format: Allow dangling parenthesis
This commit is contained in:
@@ -20,13 +20,15 @@ if(CEE_USE_QT5)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui OpenGL Widgets)
|
||||
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)
|
||||
REQUIRED
|
||||
)
|
||||
include(${QT_USE_FILE})
|
||||
endif(CEE_USE_QT5)
|
||||
|
||||
@@ -70,5 +72,7 @@ add_subdirectory(cafPdmScripting/cafPdmScripting_UnitTests)
|
||||
# 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"
|
||||
)
|
||||
|
@@ -19,7 +19,8 @@ set(MOC_HEADER_FILES cafMessagePanel.h)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets OpenGL)
|
||||
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})
|
||||
|
||||
@@ -50,7 +51,8 @@ add_library(
|
||||
cvfStructGridScalarDataAccess.h
|
||||
cafVecIjk.cpp
|
||||
cafVecIjk.h
|
||||
${MOC_SOURCE_FILES})
|
||||
${MOC_SOURCE_FILES}
|
||||
)
|
||||
|
||||
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
@@ -62,11 +64,13 @@ target_link_libraries(
|
||||
LibRender
|
||||
LibGuiQt
|
||||
cafPdmCore
|
||||
${QT_LIBRARIES})
|
||||
${QT_LIBRARIES}
|
||||
)
|
||||
|
||||
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()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -10,12 +10,14 @@ endif()
|
||||
|
||||
# Qt
|
||||
set(MOC_HEADER_FILES cafFrameAnimationControl.h cafAnimationToolBar.h
|
||||
cafPopupMenuButton.h)
|
||||
cafPopupMenuButton.h
|
||||
)
|
||||
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
|
||||
@@ -28,12 +30,14 @@ qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
|
||||
set(QRC_FILES
|
||||
${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafAnimControl.qrc
|
||||
PARENT_SCOPE)
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
set(PROJECT_FILES
|
||||
cafFrameAnimationControl.h cafFrameAnimationControl.cpp
|
||||
cafAnimationToolBar.h cafAnimationToolBar.cpp cafPopupMenuButton.h
|
||||
cafPopupMenuButton.cpp)
|
||||
cafPopupMenuButton.cpp
|
||||
)
|
||||
|
||||
add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
|
||||
|
||||
|
@@ -15,7 +15,8 @@ set(MOC_HEADER_FILES cafCmdFeature.h cafCmdFeatureManager.h)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
|
||||
@@ -36,7 +37,8 @@ set(PROJECT_FILES
|
||||
cafCmdFeatureManager.cpp
|
||||
cafCmdFeatureManager.h
|
||||
cafCmdFeatureMenuBuilder.cpp
|
||||
cafCmdFeatureMenuBuilder.h)
|
||||
cafCmdFeatureMenuBuilder.h
|
||||
)
|
||||
|
||||
add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
|
||||
|
||||
@@ -45,8 +47,9 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
target_link_libraries(${PROJECT_NAME} cafProjectDataModel ${QT_LIBRARIES})
|
||||
|
||||
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()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -15,7 +15,8 @@ set(MOC_HEADER_FILES)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
|
||||
@@ -42,7 +43,8 @@ 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
|
||||
@@ -53,7 +55,8 @@ set(PROJECT_FILES
|
||||
|
||||
set(QRC_FILES
|
||||
${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/cafCommandFeatures.qrc
|
||||
PARENT_SCOPE)
|
||||
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
|
||||
@@ -88,8 +91,9 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
# ${PROJECT_NAME} cafCommand cafUserInterface ${QT_LIBRARIES} )
|
||||
|
||||
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()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -19,7 +19,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
|
||||
)
|
||||
|
||||
set(PROJECT_FILES cafHexInterpolatorBasicTest.cpp
|
||||
cafHexInterpolator_UnitTests_main.cpp)
|
||||
cafHexInterpolator_UnitTests_main.cpp
|
||||
)
|
||||
|
||||
# add the executable
|
||||
add_executable(${PROJECT_NAME} ${PROJECT_FILES} gtest/gtest-all.cpp)
|
||||
|
@@ -12,7 +12,8 @@ endif()
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
|
||||
@@ -44,11 +45,13 @@ add_library(
|
||||
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)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/cafPdmMat3d
|
||||
)
|
||||
|
||||
target_link_libraries(${PROJECT_NAME} cafUserInterface LibCore ${QT_LIBRARIES})
|
||||
|
||||
|
@@ -7,7 +7,8 @@ else()
|
||||
find_package(
|
||||
Qt4
|
||||
COMPONENTS QtCore
|
||||
REQUIRED)
|
||||
REQUIRED
|
||||
)
|
||||
include(${QT_USE_FILE})
|
||||
endif(Qt5Core_FOUND)
|
||||
|
||||
@@ -15,11 +16,13 @@ project(cafPdmCvf_UnitTests)
|
||||
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR} ${cafPdmCore_SOURCE_DIR} ${cafPdmXml_SOURCE_DIR}
|
||||
${cafPdmCvf_SOURCE_DIR} ${LibCore_SOURCE_DIR})
|
||||
${cafPdmCvf_SOURCE_DIR} ${LibCore_SOURCE_DIR}
|
||||
)
|
||||
|
||||
set(PROJECT_FILES
|
||||
cafPdmCvf_UnitTests.cpp gtest/gtest-all.cpp cafPdmCoreVec3dTest.cpp
|
||||
cafPdmCoreColor3fTest.cpp cafPdmCoreMat4dTest.cpp)
|
||||
cafPdmCoreColor3fTest.cpp cafPdmCoreMat4dTest.cpp
|
||||
)
|
||||
|
||||
# add the executable
|
||||
add_executable(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
@@ -30,8 +33,9 @@ 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)
|
||||
@@ -40,7 +44,8 @@ if(Qt5Core_FOUND)
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
# Copy Qt Dlls
|
||||
else()
|
||||
@@ -52,12 +57,14 @@ else()
|
||||
# Debug
|
||||
execute_process(
|
||||
COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll
|
||||
${CMAKE_BINARY_DIR}/Debug/${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)
|
||||
${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll
|
||||
)
|
||||
endforeach(qtlib)
|
||||
endif(MSVC)
|
||||
endif(Qt5Core_FOUND)
|
||||
|
@@ -31,7 +31,8 @@ set(PROJECT_FILES
|
||||
cafPdmMarkdownGenerator.h
|
||||
cafPdmMarkdownGenerator.cpp
|
||||
cafPdmMarkdownBuilder.h
|
||||
cafPdmMarkdownBuilder.cpp)
|
||||
cafPdmMarkdownBuilder.cpp
|
||||
)
|
||||
|
||||
set(CAF_LIBS cafProjectDataModel)
|
||||
|
||||
@@ -42,7 +43,8 @@ if(CAF_CVF_SCRIPTING)
|
||||
cafPdmFieldScriptingCapabilityCvfColor3.h
|
||||
cafPdmFieldScriptingCapabilityCvfColor3.cpp
|
||||
cafPdmFieldScriptingCapabilityCvfVec3d.h
|
||||
cafPdmFieldScriptingCapabilityCvfVec3d.cpp)
|
||||
cafPdmFieldScriptingCapabilityCvfVec3d.cpp
|
||||
)
|
||||
list(APPEND CAF_LIBS cafPdmCvf)
|
||||
endif()
|
||||
|
||||
|
@@ -5,7 +5,8 @@ project(cafPdmScripting_UnitTests)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Xml Gui)
|
||||
REQUIRED Core Xml Gui
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
|
||||
|
||||
if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
|
||||
@@ -22,11 +23,14 @@ 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 cafPdmScriptingBasicTest.cpp)
|
||||
add_executable(
|
||||
${PROJECT_NAME} cafPdmScripting_UnitTests.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})
|
||||
|
||||
@@ -37,6 +41,7 @@ if(Qt5Core_FOUND)
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
endif(Qt5Core_FOUND)
|
||||
|
@@ -12,7 +12,8 @@ endif()
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
|
||||
set(PROJECT_FILES
|
||||
@@ -23,7 +24,8 @@ set(PROJECT_FILES
|
||||
cafPdmObjectGroup.cpp
|
||||
cafPdmObjectGroup.h
|
||||
cafPdmObject.cpp
|
||||
cafPdmObject.h)
|
||||
cafPdmObject.h
|
||||
)
|
||||
|
||||
add_library(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
|
||||
@@ -32,8 +34,9 @@ target_link_libraries(${PROJECT_NAME} cafPdmUiCore cafPdmXml ${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")
|
||||
set_target_properties(
|
||||
${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
|
||||
)
|
||||
endif()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -11,7 +11,8 @@ endif()
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core)
|
||||
REQUIRED Core
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core)
|
||||
|
||||
set(PROJECT_FILES
|
||||
@@ -58,7 +59,8 @@ set(PROJECT_FILES
|
||||
cafAsyncObjectDeleter.h
|
||||
cafAsyncObjectDeleter.inl
|
||||
cafAsyncWorkerManager.h
|
||||
cafAsyncWorkerManager.cpp)
|
||||
cafAsyncWorkerManager.cpp
|
||||
)
|
||||
|
||||
add_library(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
|
||||
@@ -67,8 +69,9 @@ 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")
|
||||
set_target_properties(
|
||||
${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
|
||||
)
|
||||
endif()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -6,7 +6,8 @@ project(cafPdmCore_UnitTests)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui)
|
||||
|
||||
if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
|
||||
@@ -34,7 +35,8 @@ set(PROJECT_FILES
|
||||
Parent.cpp
|
||||
Parent.h
|
||||
TestObj.cpp
|
||||
TestObj.h)
|
||||
TestObj.h
|
||||
)
|
||||
|
||||
# add the executable
|
||||
add_executable(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
@@ -45,8 +47,9 @@ 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})
|
||||
@@ -54,5 +57,6 @@ foreach(qtlib ${QT_LIBRARIES})
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
|
@@ -10,13 +10,15 @@ endif()
|
||||
|
||||
# These headers need to go through Qt's MOC compiler
|
||||
set(MOC_HEADER_FILES cafPdmUiEditorHandle.h cafPdmUiFieldEditorHandle.h
|
||||
cafPdmUiSelection3dEditorVisualizer.h cafQShortenedLabel.h)
|
||||
cafPdmUiSelection3dEditorVisualizer.h cafQShortenedLabel.h
|
||||
)
|
||||
|
||||
# Qt
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
|
||||
@@ -69,7 +71,8 @@ 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
|
||||
@@ -80,7 +83,8 @@ set(PROJECT_FILES
|
||||
|
||||
set(QRC_FILES
|
||||
${QRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/Resources/caf.qrc
|
||||
PARENT_SCOPE)
|
||||
PARENT_SCOPE
|
||||
)
|
||||
|
||||
add_library(${PROJECT_NAME} ${PROJECT_FILES} ${MOC_SOURCE_FILES})
|
||||
|
||||
@@ -89,8 +93,9 @@ 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")
|
||||
set_target_properties(
|
||||
${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
|
||||
)
|
||||
endif()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -12,7 +12,8 @@ endif()
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Xml)
|
||||
REQUIRED Core Xml
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
|
||||
|
||||
include_directories(..)
|
||||
@@ -38,7 +39,8 @@ set(PROJECT_FILES
|
||||
cafPdmObjectFactory.h
|
||||
cafPdmSettings.h
|
||||
cafPdmSettings.cpp
|
||||
cafPdmXmlStringValidation.h)
|
||||
cafPdmXmlStringValidation.h
|
||||
)
|
||||
|
||||
add_library(${PROJECT_NAME} ${PROJECT_FILES})
|
||||
|
||||
@@ -47,8 +49,9 @@ 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")
|
||||
set_target_properties(
|
||||
${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
|
||||
)
|
||||
endif()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -5,7 +5,8 @@ project(cafPdmXml_UnitTests)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Xml)
|
||||
REQUIRED Core Xml
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Xml)
|
||||
|
||||
if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
|
||||
@@ -25,14 +26,16 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
|
||||
add_executable(
|
||||
${PROJECT_NAME}
|
||||
cafPdmXml_UnitTests.cpp gtest/gtest-all.cpp cafPdmXmlBasicTest.cpp
|
||||
cafPdmAdvancedTemplateTest.cpp cafPdmXmlNumberTest.cpp cafPdmPtrArrayTest.cpp)
|
||||
cafPdmAdvancedTemplateTest.cpp cafPdmXmlNumberTest.cpp cafPdmPtrArrayTest.cpp
|
||||
)
|
||||
|
||||
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})
|
||||
|
||||
@@ -43,6 +46,7 @@ if(Qt5Core_FOUND)
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
endif(Qt5Core_FOUND)
|
||||
|
@@ -6,7 +6,8 @@ project(cafProjectDataModel_UnitTests)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Xml Gui)
|
||||
REQUIRED Core Xml Gui
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Xml Qt5::Gui)
|
||||
|
||||
if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
|
||||
@@ -23,13 +24,15 @@ 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)
|
||||
Child.cpp Parent.cpp TestObj.cpp
|
||||
)
|
||||
|
||||
# add the executable
|
||||
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})
|
||||
|
||||
@@ -39,5 +42,6 @@ foreach(qtlib ${QT_LIBRARIES})
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
|
@@ -9,7 +9,8 @@ find_package(OpenGL)
|
||||
|
||||
# Qt MOC
|
||||
set(MOC_HEADER_FILES MainWindow.h WidgetLayoutTest.h CustomObjectEditor.h
|
||||
MenuItemProducer.h)
|
||||
MenuItemProducer.h
|
||||
)
|
||||
|
||||
# Resource file
|
||||
set(QRC_FILES ${QRC_FILES} textedit.qrc)
|
||||
@@ -17,7 +18,8 @@ set(QRC_FILES ${QRC_FILES} textedit.qrc)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets OpenGL)
|
||||
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})
|
||||
@@ -42,7 +44,8 @@ set(PROJECT_FILES
|
||||
MenuItemProducer.cpp
|
||||
MenuItemProducer.h
|
||||
TamComboBox.h
|
||||
TamComboBox.cpp)
|
||||
TamComboBox.cpp
|
||||
)
|
||||
|
||||
# add the executable
|
||||
add_executable(
|
||||
@@ -71,8 +74,10 @@ 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})
|
||||
|
||||
@@ -81,5 +86,6 @@ foreach(qtlib ${QT_LIBRARIES})
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
|
@@ -11,7 +11,8 @@ set(QRC_FILES textedit.qrc)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets OpenGL)
|
||||
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})
|
||||
@@ -25,22 +26,27 @@ include_directories(
|
||||
${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)
|
||||
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)
|
||||
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})
|
||||
|
||||
@@ -57,5 +63,6 @@ foreach(qtlib ${QT_LIBRARIES})
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
|
@@ -52,12 +52,14 @@ set(MOC_HEADER_FILES
|
||||
cafPdmUniqueIdValidator.h
|
||||
cafPdmDoubleStringValidator.h
|
||||
cafPdmUiPickableLineEditor.h
|
||||
cafPdmUiLabelEditor.h)
|
||||
cafPdmUiLabelEditor.h
|
||||
)
|
||||
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES})
|
||||
|
||||
@@ -162,14 +164,17 @@ 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")
|
||||
set_target_properties(
|
||||
${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127"
|
||||
)
|
||||
endif()
|
||||
|
||||
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
@@ -9,28 +9,32 @@ if(CEE_USE_QT5)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets)
|
||||
REQUIRED Core Gui Widgets
|
||||
)
|
||||
set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||
else()
|
||||
find_package(
|
||||
Qt4
|
||||
COMPONENTS QtCore QtGui QtMain
|
||||
REQUIRED)
|
||||
REQUIRED
|
||||
)
|
||||
include(${QT_USE_FILE})
|
||||
endif(CEE_USE_QT5)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
set(PROJECT_FILES cafUserInterface_UnitTests.cpp cafPdmUiTreeViewModelTest.cpp
|
||||
cafPdmUiTreeSelectionQModelTest.cpp gtest/gtest-all.cpp)
|
||||
cafPdmUiTreeSelectionQModelTest.cpp gtest/gtest-all.cpp
|
||||
)
|
||||
|
||||
# add the executable
|
||||
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)
|
||||
@@ -39,7 +43,8 @@ if(Qt5Core_FOUND)
|
||||
TARGET ${PROJECT_NAME}
|
||||
POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${qtlib}>
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>)
|
||||
$<TARGET_FILE_DIR:${PROJECT_NAME}>
|
||||
)
|
||||
endforeach(qtlib)
|
||||
# Copy Qt Dlls
|
||||
else()
|
||||
@@ -51,12 +56,14 @@ else()
|
||||
# Debug
|
||||
execute_process(
|
||||
COMMAND cmake -E copy_if_different ${QT_BINARY_DIR}/${qtlib}d4.dll
|
||||
${CMAKE_BINARY_DIR}/Debug/${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)
|
||||
${CMAKE_BINARY_DIR}/Release/${qtlib}4.dll
|
||||
)
|
||||
endforeach(qtlib)
|
||||
endif(MSVC)
|
||||
endif(Qt5Core_FOUND)
|
||||
|
@@ -16,7 +16,8 @@ set(MOC_HEADER_FILES cafViewer.h)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets OpenGL)
|
||||
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})
|
||||
|
||||
@@ -37,7 +38,8 @@ add_library(
|
||||
cafOpenGLWidget.h
|
||||
cafViewer.cpp
|
||||
cafViewer.h
|
||||
${MOC_SOURCE_FILES})
|
||||
${MOC_SOURCE_FILES}
|
||||
)
|
||||
|
||||
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
@@ -49,11 +51,13 @@ target_link_libraries(
|
||||
LibRender
|
||||
LibGuiQt
|
||||
cafAnimControl
|
||||
${QT_LIBRARIES})
|
||||
${QT_LIBRARIES}
|
||||
)
|
||||
|
||||
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()
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -15,7 +15,8 @@ find_package(OpenGL)
|
||||
find_package(
|
||||
Qt5
|
||||
COMPONENTS
|
||||
REQUIRED Core Gui Widgets OpenGL)
|
||||
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})
|
||||
|
||||
@@ -49,7 +50,8 @@ add_library(
|
||||
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})
|
||||
|
||||
@@ -61,6 +63,7 @@ target_link_libraries(
|
||||
LibRender
|
||||
LibGuiQt
|
||||
CommonCode
|
||||
${QT_LIBRARIES})
|
||||
${QT_LIBRARIES}
|
||||
)
|
||||
|
||||
source_group("" FILES ${PROJECT_FILES})
|
||||
|
@@ -21,7 +21,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp
|
||||
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)
|
||||
|
Reference in New Issue
Block a user