From 6786894adb7cb75c37aeb8d09dec9682368e36fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 20 Aug 2015 09:57:09 +0200 Subject: [PATCH] Fixed Cmake generation error. wrap_qt cant be run in an included sub-cmake-file --- ApplicationCode/CMakeLists.txt | 2 +- ApplicationCode/Commands/CMakeLists_files.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 160fc226b7..f855410af4 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -144,6 +144,7 @@ add_subdirectory(GeoMech/GeoMechDataModel) ############################################################################# set ( QT_MOC_HEADERS + ${QT_MOC_HEADERS} Application/RiaApplication.h ProjectDataModel/RimUiTreeModelPdm.h @@ -157,7 +158,6 @@ set ( QT_MOC_HEADERS SocketInterface/RiaSocketServer.h UserInterface/RiuMultiCaseImportDialog.h UserInterface/RiuViewerCommands.h - ) qt4_wrap_cpp( MOC_FILES_CPP ${QT_MOC_HEADERS} ) diff --git a/ApplicationCode/Commands/CMakeLists_files.cmake b/ApplicationCode/Commands/CMakeLists_files.cmake index 22cdcb901b..15ad2bf38f 100644 --- a/ApplicationCode/Commands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/CMakeLists_files.cmake @@ -92,11 +92,10 @@ ${CEE_CURRENT_LIST_DIR}RicDeleteItemFeature.cpp ) set (QT_MOC_HEADERS +${QT_MOC_HEADERS} ${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h ) -qt4_wrap_cpp(MOC_FILES_CPP ${QT_MOC_HEADERS}) - list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} )