Control: tags -1 patch fixed-upstream Hi,
This was fixed upstream in 3.5.0-rc1. Some relevant discussion and a bugreport: http://public.kitware.com/pipermail/cmake/2016-January/062537.html https://public.kitware.com/Bug/view.php?id=15948 I bisected the fix to commit: 9d653f9c1cc129be4fdce7f0e93c282760c7603e cmFLTKWrapUI: Remove CMake 2.2 compat code. I have attached that commit which you can use as a patch to 3.4 if you want. Thanks, James
From 9d653f9c1cc129be4fdce7f0e93c282760c7603e Mon Sep 17 00:00:00 2001 From: Stephen Kelly <[email protected]> Date: Sat, 29 Aug 2015 18:05:46 +0200 Subject: [PATCH] cmFLTKWrapUI: Remove CMake 2.2 compat code. CMake 3.0 dropped CMake <= 2.4 compatibility. --- Source/cmFLTKWrapUICommand.cxx | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx index 12adfd9..d17d664 100644 --- a/Source/cmFLTKWrapUICommand.cxx +++ b/Source/cmFLTKWrapUICommand.cxx @@ -129,45 +129,6 @@ void cmFLTKWrapUICommand::FinalPass() cmSystemTools::Message(msg.c_str(),"Warning"); return; } - std::vector<cmSourceFile*> srcs; - target->GetSourceFiles(srcs, ""); - bool found = false; - for (unsigned int i = 0; i < srcs.size(); ++i) - { - if (srcs[i]->GetFullPath() == - this->GeneratedSourcesClasses[0]->GetFullPath()) - { - found = true; - break; - } - } - if (!found) - { - std::string msg = - "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of " - "source files that should be added to your executable or library. It " - "appears that you have not added these source files to your target. " - "You should change your CMakeLists.txt file to " - "directly add the generated files to the target. " - "For example FTLK_WRAP_UI(foo src1 src2 src3) " - "will create a variable named foo_FLTK_UI_SRCS that contains the list " - "of sources to add to your target when you call ADD_LIBRARY or " - "ADD_EXECUTABLE. For now CMake will add the sources to your target " - "for you as was done in CMake 2.0 and earlier. In the future this may " - "become an error."; - msg +="The problem was found while processing the source directory: "; - msg += this->Makefile->GetCurrentSourceDirectory(); - cmSystemTools::Message(msg.c_str(),"Warning"); - // first we add the rules for all the .fl to .h and .cxx files - size_t lastHeadersClass = this->GeneratedSourcesClasses.size(); - - // Generate code for all the .fl files - for(size_t classNum = 0; classNum < lastHeadersClass; classNum++) - { - this->Makefile->GetTargets()[this->Target] - .AddSource(this->GeneratedSourcesClasses[classNum]->GetFullPath()); - } - } } -- 2.7.0
signature.asc
Description: This is a digitally signed message part
