Remove indirection from ocloc_lib and ocloc names

[zboszor]

This allows CMAKE to wrap the executable with
-DCMAKE_CROSSCOMPILING_EMULATOR=...

Signed-off-by: Zoltán Böszörményi <[email protected]>

[JablonskiMateusz]

could you pass -Dcloc_cmd_prefix=ocloc to cmake command in your environment instead of removing this code?

[zboszor]

The problem is that with two or more levels of variable indirection, cmake doesn't apply the CMAKE_CROSSCOMPILING_EMULATOR wrapper command and this is the case with cloc_cmd_prefix.

[JablonskiMateusz]

For these add_custom_command there is only one level of indirection - usage of ${cloc_cmd_prefix}. The problem I see with using CMAKE_CROSSCOMPILING_EMULATOR is that cmake adds CMAKE_CROSSCOMPILING_EMULATOR before command and in our default scenario there will be something like ${CMAKE_CROSSCOMPILING_EMULATOR} LD_LIBRARY_PATH=... ocloc ... which will cause issue as environment variable cannot be defined in the middle of cmdline. Therefore I hope that if you define cloc_cmd_prefix as ocloc then you will get ${CMAKE_CROSSCOMPILING_EMULATOR} ocloc ... which looks like a valid cmdline. Please double check that.

[JablonskiMateusz]

@zboszor have you checked if -Dcloc_cmd_prefix=ocloc helps for the issue?

[zboszor]

Yes, I checked. It is this way in meta-intel and it's good if ocloc is built for running on the crosscompiling host.
But it is broken if coupled with -DCMAKE_CROSSCOMPILING_EMULATOR=...

[JablonskiMateusz]

could you share build logs? what exactly is broken?

[zboszor]

could you share build logs? what exactly is broken?

I don't have the build logs.
The issue is that the ocloc command is not prefixed with the crosscompiling wrapper.
If ocloc is cross-built for the target, it can't run properly using the host libraries.
E.g. the Yocto cross-build is not multilib but the host is, the runtime linker path is not good to run the binary without the wrapper that executes the binary in qemu, etc.

[JablonskiMateusz]

@zboszor could you verify if it is still needed? cross-build with qemu works fine for us

[JablonskiMateusz]

why is this change needed? I see what can be incorrect with our current implementation - project is defined before OCLOC_NAME is defined which evaluates to project(_lib) . Simply moving set(OCLOC_NAME "ocloc") to a line before project(${OCLOC_NAME}_lib) should fix this issue

[zboszor]

It's not really needed. It just looked more consistent with the rest of this patch.