OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2536 Build System AppFwk : Several updates

Browse Source 
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 18:37:11 +01:00
parent 65c3d6ff12
commit 3fbce58fa5
16 changed files with 107 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Fwk/AppFwk/cafCommand/CMakeLists.txt
+3 -4
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})