Bugfix: cmake_multi generator used with Xcode CMake generator #7341

SSE4 · 2020-07-11T07:28:03Z

improved version of #7099

Changelog: Bugfix: cmake_multi generator used with Xcode CMake generator.
Docs: omit

Refer to the issue that supports this Pull Request.
If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
I've read the Contributing guide.
I've followed the PEP8 style guides for Python code.
I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

^{Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.}

Signed-off-by: SSE4 <tomskside@gmail.com>

conans/client/generators/cmake_common.py

danimtb · 2020-07-16T08:53:42Z

The conan_find_apple_frameworks macro is used in other generators. Should we provide the new BUILD_TYPE argument in those as well or it will be an empty string if the argument is omitted?

SSE4 · 2020-07-16T08:56:43Z

@danimtb I've tested all generators.
there are seems to be two different implementations:

conan/conans/client/generators/cmake_find_package_common.py

Line 113 in fecd263

macro(conan_find_apple_frameworks FRAMEWORKS_FOUND FRAMEWORKS FRAMEWORKS_DIRS)

(cmake_find_package, cmake_find_package_multi)

conan/conans/client/generators/cmake_common.py

Line 829 in c923c69

macro(conan_find_apple_frameworks FRAMEWORKS_FOUND FRAMEWORKS SUFFIX)

(cmake, cmake_multi)

danimtb · 2020-07-16T09:03:51Z

thank you, I forgot about the different implementations.

danimtb

I would like to have the implementation as suggested here #7341 (comment) but it would require major changes in the generators using this macro

jgsogo · 2020-07-17T08:12:13Z

I think I didn't explain myself well enough. In this PR we have:

    apple_frameworks_macro = textwrap.dedent("""
        macro(conan_find_apple_frameworks FRAMEWORKS_FOUND FRAMEWORKS SUFFIX BUILD_TYPE)
            if(APPLE)
                if(CMAKE_BUILD_TYPE)
                    if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${CMAKE_BUILD_TYPE} MATCHES "Release")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${CMAKE_BUILD_TYPE} MATCHES "RelWithDebInfo")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${CMAKE_BUILD_TYPE} MATCHES "MinSizeRel")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    endif()
                elseif(NOT BUILD_TYPE STREQUAL "")
                    if(${BUILD_TYPE} MATCHES "_DEBUG")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${BUILD_TYPE} MATCHES "_RELEASE")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${BUILD_TYPE} MATCHES "_RELWITHDEBINFO")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${BUILD_TYPE} MATCHES "_MINSIZEREL")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    endif()
                endif()
                foreach(_FRAMEWORK ${FRAMEWORKS})
                    # https://cmake.org/pipermail/cmake-developers/2017-August/030199.html
                    find_library(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND NAME ${_FRAMEWORK} PATHS ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    if(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND)
                        list(APPEND ${FRAMEWORKS_FOUND} ${CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND})
                    else()
                        message(FATAL_ERROR "Framework library ${_FRAMEWORK} not found in paths: ${CONAN_FRAMEWORK_DIRS${SUFFIX}}")
                    endif()
                endforeach()
            endif()
        endmacro()

I'm proposing something like:

    apple_frameworks_macro = textwrap.dedent("""
        macro(conan_find_apple_frameworks FRAMEWORKS_FOUND FRAMEWORKS SUFFIX BUILD_TYPE)
            if(APPLE)

                if(CMAKE_BUILD_TYPE)
                    set(_BTYPE CMAKE_BUILD_TYPE)
                elseif(NOT BUILD_TYPE STREQUAL "")
                    set(_BTYPE BUILD_TYPE)
                endif()

                if(_BTYPE)
                    if(${_BTYPE} MATCHES "Debug|_DEBUG")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${_BTYPE} MATCHES "Release|_RELEASE")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELEASE} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${_BTYPE} MATCHES "RelWithDebInfo|_RELWITHDEBINFO")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_RELWITHDEBINFO} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    elseif(${_BTYPE} MATCHES "MinSizeRel|_MINSIZEREL")
                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_MINSIZEREL} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    endif()
                endif()
                foreach(_FRAMEWORK ${FRAMEWORKS})
                    # https://cmake.org/pipermail/cmake-developers/2017-August/030199.html
                    find_library(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND NAME ${_FRAMEWORK} PATHS ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
                    if(CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND)
                        list(APPEND ${FRAMEWORKS_FOUND} ${CONAN_FRAMEWORK_${_FRAMEWORK}_FOUND})
                    else()
                        message(FATAL_ERROR "Framework library ${_FRAMEWORK} not found in paths: ${CONAN_FRAMEWORK_DIRS${SUFFIX}}")
                    endif()
                endforeach()
            endif()
        endmacro()

Maybe I'm not able to see something and those blocks are not identical...

SSE4 · 2020-07-17T09:03:17Z

@jgsogo seems like it doesn't pass tests with code you have proposed, it doesn't find frameworks any longer. probably, I'll revert it.

jgsogo · 2020-07-17T09:06:06Z

@jgsogo seems like it doesn't pass tests with code you have proposed, it doesn't find frameworks any longer. probably, I'll revert it.

It works locally...

SSE4 · 2020-07-17T09:07:13Z

@jgsogo seems like it doesn't pass tests with code you have proposed, it doesn't find frameworks any longer. probably, I'll revert it.

It works locally...

maybe I have missed something or did a stupid typo, feel free to push into my branch with your local changes

jgsogo · 2020-07-17T09:08:13Z

@jgsogo seems like it doesn't pass tests with code you have proposed, it doesn't find frameworks any longer. probably, I'll revert it.

It works locally...

maybe I have missed something or did a stupid typo, feel free to push into my branch with your local changes

It was a typo in my suggestion. We need to use the values:

                if(CMAKE_BUILD_TYPE)
                    set(_BTYPE ${CMAKE_BUILD_TYPE})
                elseif(NOT BUILD_TYPE STREQUAL "")
                    set(_BTYPE ${BUILD_TYPE})
                endif()

jgsogo

We really need to refactor all this stuff... I'll keep working on it. 💪

memsharded · 2020-07-27T11:43:33Z

conans/client/generators/cmake_common.py

                        set(CONAN_FRAMEWORKS${SUFFIX} ${CONAN_FRAMEWORKS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORKS${SUFFIX}})
                        set(CONAN_FRAMEWORK_DIRS${SUFFIX} ${CONAN_FRAMEWORK_DIRS${SUFFIX}_DEBUG} ${CONAN_FRAMEWORK_DIRS${SUFFIX}})
-                    elseif(${CMAKE_BUILD_TYPE} MATCHES "Release")
+                    elseif(${_BTYPE} MATCHES "Release|_RELEASE")


Yes, this needs to be refactored, improved at some point, but I understand that now it is better to move forward.

- fix cmake_multi generator used with Xcode CMake generator

690dbb2

Signed-off-by: SSE4 <tomskside@gmail.com>

SSE4 force-pushed the apple_framework_multi branch from d379ece to 690dbb2 Compare July 11, 2020 07:47

SSE4 changed the title ~~This fixes a problem where Mac frameworks cannot be found… #7099~~ Bugfix: cmake_multi generator used with Xcode CMake generator Jul 11, 2020

SSE4 mentioned this pull request Jul 11, 2020

This fixes a problem where Mac frameworks cannot be found… #7099

Closed

5 tasks

jgsogo requested a review from danimtb July 15, 2020 16:44

jgsogo reviewed Jul 15, 2020

View reviewed changes

conans/client/generators/cmake_common.py Show resolved Hide resolved

jgsogo added this to the 1.28 milestone Jul 15, 2020

danimtb approved these changes Jul 16, 2020

View reviewed changes

SSE4 added 2 commits July 17, 2020 15:16

Update cmake_common.py

b3f3d92

Update cmake_common.py

68afc90

Update cmake_common.py

2ef16b4

jgsogo approved these changes Jul 17, 2020

View reviewed changes

jgsogo assigned memsharded Jul 17, 2020

memsharded approved these changes Jul 27, 2020

View reviewed changes

memsharded merged commit 7329ee9 into conan-io:develop Jul 27, 2020

memsharded mentioned this pull request Jul 27, 2020

[bug] Framework library X not found in paths: <blank> #6416

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bugfix: cmake_multi generator used with Xcode CMake generator #7341

Bugfix: cmake_multi generator used with Xcode CMake generator #7341

SSE4 commented Jul 11, 2020 •

edited by czoido

danimtb commented Jul 16, 2020

SSE4 commented Jul 16, 2020

danimtb commented Jul 16, 2020

danimtb left a comment

jgsogo commented Jul 17, 2020

SSE4 commented Jul 17, 2020

jgsogo commented Jul 17, 2020

SSE4 commented Jul 17, 2020

jgsogo commented Jul 17, 2020

jgsogo left a comment

memsharded Jul 27, 2020

Bugfix: cmake_multi generator used with Xcode CMake generator #7341

Bugfix: cmake_multi generator used with Xcode CMake generator #7341

Conversation

SSE4 commented Jul 11, 2020 • edited by czoido

danimtb commented Jul 16, 2020

SSE4 commented Jul 16, 2020

danimtb commented Jul 16, 2020

danimtb left a comment

Choose a reason for hiding this comment

jgsogo commented Jul 17, 2020

SSE4 commented Jul 17, 2020

jgsogo commented Jul 17, 2020

SSE4 commented Jul 17, 2020

jgsogo commented Jul 17, 2020

jgsogo left a comment

Choose a reason for hiding this comment

memsharded Jul 27, 2020

Choose a reason for hiding this comment

SSE4 commented Jul 11, 2020 •

edited by czoido