[llvm] r225319 - cmake: Add 'examples' target

[Aaron Ballman]

On Wed, Jan 7, 2015 at 9:41 AM, Duncan Exon Smith <dexonsmith at apple.com> wrote:
> Hmm... looks like those commits only make sense for make/ninja, not for IDEs.  I was too optimistic.
>
> If you know what's wrong and can fix it, please go ahead.  Otherwise those commits should just be reverted.  I'll revert myself in a few hours when I get to work if you haven't replied.

I think what's wrong is that we already have a folder named Examples,
and winds up adding a target with the same name. This could be as
simple to fix as picking a new name for the custom target, but I'm not
enough of a CMake expert to really say whether that's the right fix or
not.

I've reverted in r225355 for now, which gets MSVC to load the
generated solution without errors.

Thanks!

~Aaron

>
>> On Jan 7, 2015, at 5:50 AM, Aaron Ballman <aaron at aaronballman.com> wrote:
>>
>> When I fetched this morning and re-ran CMAKE for Visual Studio 2013, I
>> got a new error when opening the resulting solution: "The solution
>> already contains an item named 'examples'.
>>
>> Also, I now see a top-level project named "Kaleidiscioe" that should
>> probably live somewhere other than the top level.
>>
>> ~Aaron
>>
>> On Tue, Jan 6, 2015 at 6:42 PM, Duncan P. N. Exon Smith
>> <dexonsmith at apple.com> wrote:
>>> Author: dexonsmith
>>> Date: Tue Jan  6 17:42:49 2015
>>> New Revision: 225319
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=225319&view=rev
>>> Log:
>>> cmake: Add 'examples' target
>>>
>>> Modified:
>>>    llvm/trunk/cmake/modules/AddLLVM.cmake
>>>
>>> Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=225319&r1=225318&r2=225319&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
>>> +++ llvm/trunk/cmake/modules/AddLLVM.cmake Tue Jan  6 17:42:49 2015
>>> @@ -513,6 +513,12 @@ macro(add_llvm_example name)
>>>     install(TARGETS ${name} RUNTIME DESTINATION examples)
>>>   endif()
>>>   set_target_properties(${name} PROPERTIES FOLDER "Examples")
>>> +
>>> +  if(NOT TARGET examples)
>>> +    add_custom_target(examples ${name})
>>> +  else()
>>> +    add_dependencies(examples ${name})
>>> +  endif()
>>> endmacro(add_llvm_example name)
>>>
>>>
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits