[Buildroot] [PATCH v2 4/4] cdrkit: convert to CMAKETARGETS infrastructure

[Bjørn Forsman]

2011/1/23 Samuel Martin <s.martin49 at gmail.com>:
> Hi,
>
>
> 2011/1/15 Bjørn Forsman <bjorn.forsman at gmail.com>
>>
>> Signed-off-by: Bjørn Forsman <bjorn.forsman at gmail.com>
>> ---
>>  package/cdrkit/cdrkit.mk |   65
>> ++++++---------------------------------------
>>  1 files changed, 9 insertions(+), 56 deletions(-)
>>
>> diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
>> index a0ce9cb..0e97cc1 100644
>> --- a/package/cdrkit/cdrkit.mk
>> +++ b/package/cdrkit/cdrkit.mk
>> @@ -11,61 +11,14 @@ else
>>  CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0
>>  endif
>>
>> -# CMake doesn't support having the --sysroot option directly in the
>> -# compiler path, so move this option to the CFLAGS/CXXFLAGS variables.
>> -CDRKIT_TARGET_CC = $(filter-out --sysroot=%,$(TARGET_CC))
>> -CDRKIT_TARGET_CXX = $(filter-out --sysroot=%,$(TARGET_CXX))
>> -CDRKIT_TARGET_CFLAGS = $(filter --sysroot=%,$(TARGET_CC))
>> $(TARGET_CFLAGS)
>> -CDRKIT_TARGET_CXXFLAGS = $(filter --sysroot=%,$(TARGET_CXX))
>> $(TARGET_CXXFLAGS)
>> +CDRKIT_CONF_OPT += $(CMAKE_ENDIAN_OPT)
>>
>> -define CDRKIT_CONFIGURE_CMDS
>> - -mkdir $(@D)/build
>> - (cd $(@D)/build ; \
>> -       $(HOST_DIR)/usr/bin/cmake .. \
>> -               -Wno-dev \
>> -               -DCMAKE_SYSTEM_NAME:STRING="Linux" \
>> -               -DCMAKE_C_COMPILER:FILEPATH="$(CDRKIT_TARGET_CC)" \
>> -               -DCMAKE_CXX_COMPILER:FILEPATH="$(CDRKIT_TARGET_CXX)" \
>> -               -DCMAKE_C_FLAGS:STRING="$(CDRKIT_TARGET_CFLAGS)" \
>> -               -DCMAKE_CXX_FLAGS:STRING="$(CDRKIT_TARGET_CXXFLAGS)" \
>> -               -DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
>> -               -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
>> -               -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
>> -               -DCMAKE_FIND_ROOT_PATH:PATH="$(STAGING_DIR)" \
>> -               -DCMAKE_INSTALL_PREFIX:PATH="$(TARGET_DIR)/usr" \
>> -               $(CMAKE_ENDIAN_OPT) \
>> - )
>> -endef
>> -
>> -define CDRKIT_BUILD_CMDS
>> - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build
>> -endef
>> -
>> -define CDRKIT_INSTALL_TARGET_CMDS
>> - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build install
>> -endef
>> -
>> -define HOST_CDRKIT_CONFIGURE_CMDS
>> - -mkdir $(@D)/build
>> - (cd $(@D)/build ; \
>> -       $(HOST_DIR)/usr/bin/cmake .. \
>> -               -Wno-dev \
>> -               -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \
>> -               -DCMAKE_EXE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
>> -               -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
>> -               -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
>> -               -DCMAKE_INSTALL_PREFIX:STRING="$(HOST_DIR)/usr" \
>> - )
>> -endef
>> -
>> -define HOST_CDRKIT_BUILD_CMDS
>> - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build
>> -endef
>> -
>> -define HOST_CDRKIT_INSTALL_CMDS
>> - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build  install
>> -endef
>> -
>> -$(eval $(call GENTARGETS,package,cdrkit))
>> -$(eval $(call GENTARGETS,package,cdrkit,host))
>> +## cdrkit isn't completely re-rooted by CMAKE_FIND_ROOT_PATH, so add
>> +## some extra flags so it finds needed libs and headers.
>> +CDRKIT_CONF_OPT += -DCMAKE_REQUIRED_INCLUDES="$(STAGING_DIR)/usr/include"
>> +CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)"
>> +HOST_CDRKIT_CONF_OPT +=
>> -DCMAKE_REQUIRED_INCLUDES="$(HOST_DIR)/usr/include"
>> +HOST_CDRKIT_CONF_OPT += -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)"
>
> any specific reasons to remove defined variables' type?

AFAIK, the variable type is only used by CMake GUI so it can use the
most appropriate widget (when manipulating the variables). I didn't
see any use for this in Buildroot so I took it out.

The reason it was included in v1 was that cdrkit.mk had it (which I
based this on) and I did an early release :-) Maybe Thomas (original
cdrkit.mk author) has any comments?

Best regards,
Bjørn Forsman