#2536 Build System AppFwk : Several updates

Simplified automoc
Use target_include_directories and target_link_libraries
Use CMake 2.8.12
This commit is contained in:
Magne Sjaastad 2018-02-27 17:20:46 +01:00
parent 65c3d6ff12
commit 3fbce58fa5
16 changed files with 107 additions and 41 deletions

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (CommonCode)
@ -15,8 +15,6 @@ include_directories(
${LibGuiQt_SOURCE_DIR}
${LibRender_SOURCE_DIR}
${LibViewing_SOURCE_DIR}
${cafPdmCore_SOURCE_DIR}
)
# These headers need to go through Qt's MOC compiler
@ -54,3 +52,22 @@ add_library( ${PROJECT_NAME}
${MOC_FILES_CPP}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
LibCore
LibGeometry
LibViewing
LibRender
LibGuiQt
cafPdmCore
${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (cafAnimControl)
@ -11,7 +11,7 @@ set( QOBJECT_HEADERS
cafAnimationToolBar.h
)
if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) )
if ( NOT CMAKE_AUTOMOC )
qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} )
endif()
@ -30,8 +30,21 @@ set( QRC_FILES
PARENT_SCOPE
)
add_library( ${PROJECT_NAME}
set( PROJECT_FILES
cafFrameAnimationControl.h
cafFrameAnimationControl.cpp
cafAnimationToolBar.h
cafAnimationToolBar.cpp
)
add_library( ${PROJECT_NAME}
${PROJECT_FILES}
${MOC_FILES_CPP}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
source_group("" FILES ${PROJECT_FILES})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
# Qt
find_package ( Qt4 COMPONENTS QtCore QtGui QtMain )
@ -13,7 +13,7 @@ set( QOBJECT_HEADERS
cafCmdFeatureManager.h
)
if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) )
if ( NOT CMAKE_AUTOMOC )
qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} )
endif()
@ -70,5 +70,4 @@ target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel
)
source_group("" FILES ${PROJECT_FILES})
source_group("" FILES ${PROJECT_FILES})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCvf)
@ -8,14 +8,8 @@ include (${QT_USE_FILE})
include_directories(
${LibCore_SOURCE_DIR}
${cafProjectDataModel_SOURCE_DIR}
${cafUserInterface_SOURCE_DIR}
${cafPdmCore_SOURCE_DIR}
${cafPdmUiCore_SOURCE_DIR}
)
add_library( ${PROJECT_NAME}
cafPdmCoreColor3f.h
cafPdmUiCoreColor3f.cpp
@ -39,11 +33,15 @@ add_library( ${PROJECT_NAME}
cafPdmFieldCvfMat4d.h
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
cafPdmCore
cafPdmUiCore
cafUserInterface
cafProjectDataModel
LibCore
${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES})

View File

@ -32,4 +32,4 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
source_group("" FILES ${PROJECT_FILES})
source_group("" FILES ${PROJECT_FILES})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (cafPdmCore)

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
find_package ( Qt4 COMPONENTS QtCore QtGui )
include (${QT_USE_FILE})

View File

@ -53,4 +53,4 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR}
)
source_group("" FILES ${PROJECT_FILES})
source_group("" FILES ${PROJECT_FILES})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
find_package ( Qt4 COMPONENTS QtCore )
include (${QT_USE_FILE})
@ -26,6 +26,8 @@ target_link_libraries ( ${PROJECT_NAME}
${THREAD_LIBRARY}
)
source_group("" FILES ${PROJECT_FILES})
# Copy Qt Dlls
if (MSVC)
set (QTLIBLIST QtCore )

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
find_package ( Qt4 COMPONENTS QtCore QtGui )
include (${QT_USE_FILE})
@ -12,10 +12,9 @@ include_directories (
set( PROJECT_FILES
cafPdmBasicTest.cpp
cafProjectDataModel_UnitTests.cpp
Child.cpp
Parent.cpp
TestObj.cpp
Child.cpp
Parent.cpp
TestObj.cpp
)
# add the executable

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (cafTensor)
@ -17,6 +17,11 @@ add_library( ${PROJECT_NAME}
${PROJECT_FILES}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries( ${PROJECT_NAME} LibCore )
source_group("" FILES ${PROJECT_FILES})
source_group("" FILES ${PROJECT_FILES})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
# Qt
find_package ( Qt4 COMPONENTS QtCore QtGui QtMain QtOpenGl )

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
# Qt
find_package ( Qt4 COMPONENTS QtCore QtGui QtMain )
@ -42,7 +42,7 @@ set( QOBJECT_HEADERS
cafPdmUiDoubleValueEditor.h
)
if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) )
if ( NOT CMAKE_AUTOMOC )
qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} )
endif()

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
find_package ( Qt4 COMPONENTS QtCore QtGui QtMain )
include (${QT_USE_FILE})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (cafViewer)
@ -12,8 +12,6 @@ include_directories(
${LibViewing_SOURCE_DIR}
${LibRender_SOURCE_DIR}
${LibGuiQt_SOURCE_DIR}
${cafAnimControl_SOURCE_DIR}
)
# These headers need to go through Qt's MOC compiler
@ -21,7 +19,7 @@ set( QOBJECT_HEADERS
cafViewer.h
)
if ( (${CMAKE_VERSION} VERSION_LESS 2.8.6) OR (NOT CMAKE_AUTOMOC) )
if ( NOT CMAKE_AUTOMOC )
qt4_wrap_cpp( MOC_FILES_CPP ${QOBJECT_HEADERS} )
endif()
@ -44,3 +42,19 @@ add_library( ${PROJECT_NAME}
${MOC_FILES_CPP}
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
LibCore
LibGeometry
LibViewing
LibRender
LibGuiQt
${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES})

View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.12)
project (cafVizExtensions)
@ -36,3 +36,22 @@ add_library( ${PROJECT_NAME}
cafHexGridIntersectionTools/cafHexGridIntersectionTools.h
cafHexGridIntersectionTools/cafHexGridIntersectionTools.cpp
)
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries ( ${PROJECT_NAME}
LibCore
LibGeometry
LibViewing
LibRender
LibGuiQt
CommonCode
${QT_LIBRARIES}
)
source_group("" FILES ${PROJECT_FILES})