kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: use even more absolute paths, can't hurt for out-of-source builds

Browse Source 
STYLE: use SET_SOURCE_FILES_PROPERTIES() on multiple files at once instead
of interating over each one of them
STYLE: no need to add target.ld to the clean-files, this is done now automatically by add_custom_command()
ENH: now also MS nmake can be used to build ecos apps

Alex
This commit is contained in:
Alexander Neundorf 2007-01-23 13:29:44 -05:00
parent 0272c209a5
commit 152040fd83
1 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Modules/UseEcos.cmake
View File

@ -16,9 +16,6 @@
# for internal use only: # for internal use only:
# ECOS_ADD_TARGET_LIB # ECOS_ADD_TARGET_LIB
INCLUDE(AddFileDependencies)
# first check that ecosconfig is available # first check that ecosconfig is available
FIND_PROGRAM(ECOSCONFIG_EXECUTABLE NAMES ecosconfig) FIND_PROGRAM(ECOSCONFIG_EXECUTABLE NAMES ecosconfig)
IF(NOT ECOSCONFIG_EXECUTABLE) IF(NOT ECOSCONFIG_EXECUTABLE)
@ -113,14 +110,13 @@ ENDMACRO (ECOS_USE_I386_ELF_TOOLS)
#usage: ECOS_ADJUST_DIRECTORY(adjusted_SRCS ${my_srcs}) #usage: ECOS_ADJUST_DIRECTORY(adjusted_SRCS ${my_srcs})
MACRO(ECOS_ADJUST_DIRECTORY _target_FILES ) MACRO(ECOS_ADJUST_DIRECTORY _target_FILES )
FOREACH (_current_FILE ${ARGN}) FOREACH (_current_FILE ${ARGN})
IF (${_current_FILE} MATCHES "^/.+") # don't adjust for absolute paths GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE)
SET(tmp ${_current_FILE}) IF (NOT ${_abs_FILE} STREQUAL ${_current_FILE})
ELSE (${_current_FILE} MATCHES "^/.+") GET_FILENAME_COMPONENT(_abs_FILE ${CMAKE_CURRENT_SOURCE_DIR}/../${_current_FILE} ABSOLUTE)
SET(tmp ${CMAKE_CURRENT_SOURCE_DIR}/../${_current_FILE}) ENDIF (NOT ${_abs_FILE} STREQUAL ${_current_FILE})
GET_FILENAME_COMPONENT(tmp ${tmp} ABSOLUTE) LIST(APPEND ${_target_FILES} ${_abs_FILE})
ENDIF (${_current_FILE} MATCHES "^/.+")
SET(${_target_FILES} ${${_target_FILES}} ${tmp})
ENDFOREACH (_current_FILE) ENDFOREACH (_current_FILE)
LIST(APPEND ${_target_FILES} ${CMAKE_SOURCE_DIR}/firmware/common/utils/src/reent.c)
ENDMACRO(ECOS_ADJUST_DIRECTORY) ENDMACRO(ECOS_ADJUST_DIRECTORY)
# the default ecos config file name # the default ecos config file name
@ -128,7 +124,7 @@ ENDMACRO(ECOS_ADJUST_DIRECTORY)
SET(ECOS_CONFIG_FILE ecos.ecc) SET(ECOS_CONFIG_FILE ecos.ecc)
#creates the dependancy from all source files on the ecos target.ld, #creates the dependancy from all source files on the ecos target.ld,
#adds the command for compiling ecos and adds target.ld to the make_clean_files #adds the command for compiling ecos
MACRO(ECOS_ADD_TARGET_LIB) MACRO(ECOS_ADD_TARGET_LIB)
# when building out-of-source, create the ecos/ subdir # when building out-of-source, create the ecos/ subdir
IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/ecos) IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/ecos)
@ -136,25 +132,20 @@ MACRO(ECOS_ADD_TARGET_LIB)
ENDIF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/ecos) ENDIF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/ecos)
#sources depend on target.ld #sources depend on target.ld
FOREACH (_current_FILE ${ARGN}) SET_SOURCE_FILES_PROPERTIES(
ADD_FILE_DEPENDENCIES(${_current_FILE} ${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib/target.ld) ${ARGN}
ENDFOREACH (_current_FILE)
#use a variable for the make_clean_files since later on even more files are added
SET(ECOS_ADD_MAKE_CLEAN_FILES ${ECOS_ADD_MAKE_CLEAN_FILES};ecos/install/lib/target.ld)
SET_DIRECTORY_PROPERTIES(
PROPERTIES PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES "${ECOS_ADD_MAKE_CLEAN_FILES}" ) OBJECT_DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib/target.ld
)
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib/target.ld ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib/target.ld
COMMAND sh COMMAND sh -c \"make -C ${CMAKE_CURRENT_BINARY_DIR}/ecos || exit -1\; if [ -e ${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib/target.ld ] \; then touch ${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib/target.ld\; fi\"
ARGS -c \"make -C ecos || exit -1\; if [ -e ecos/install/lib/target.ld ] \; then touch ecos/install/lib/target.ld\; fi\"
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ecos/makefile DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ecos/makefile
) )
ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ecos/makefile ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ecos/makefile
COMMAND sh COMMAND sh -c \" cd ${CMAKE_CURRENT_BINARY_DIR}/ecos\; ${ECOSCONFIG_EXECUTABLE} --config=${CMAKE_CURRENT_SOURCE_DIR}/ecos/${ECOS_CONFIG_FILE} tree || exit -1\;\"
ARGS -c \" cd ${CMAKE_CURRENT_BINARY_DIR}/ecos\; ${ECOSCONFIG_EXECUTABLE} --config=${CMAKE_CURRENT_SOURCE_DIR}/ecos/${ECOS_CONFIG_FILE} tree || exit -1\;\"
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ecos/${ECOS_CONFIG_FILE} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/ecos/${ECOS_CONFIG_FILE}
) )
@ -174,15 +165,20 @@ MACRO(ECOS_ADD_EXECUTABLE _exe_NAME )
ADD_DEFINITIONS(-D__ECOS__=1 -D__ECOS=1) ADD_DEFINITIONS(-D__ECOS__=1 -D__ECOS=1)
SET(ECOS_DEFINITIONS -Wall -Wno-long-long -pipe -fno-builtin) SET(ECOS_DEFINITIONS -Wall -Wno-long-long -pipe -fno-builtin)
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -fno-rtti -Wctor-dtor-privacy -fno-strict-aliasing -fno-exceptions")
#the executable depends on ecos target.ld #the executable depends on ecos target.ld
ECOS_ADD_TARGET_LIB(${ARGN}) ECOS_ADD_TARGET_LIB(${ARGN})
#special link commands for ecos-executables # when using nmake makefiles, the custom buildtype supresses the default cl.exe flags
# and the rules for creating objects are adjusted for gcc
SET(CMAKE_BUILD_TYPE CUSTOM_ECOS_BUILD)
SET(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <FLAGS> -o <OBJECT> -c <SOURCE>")
SET(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <FLAGS> -o <OBJECT> -c <SOURCE>")
# special link commands for ecos-executables
SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <OBJECTS> -o <TARGET> ${_ecos_EXTRA_LIBS} -nostdlib -nostartfiles -L${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib -Ttarget.ld ${ECOS_LD_MCPU}") SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <OBJECTS> -o <TARGET> ${_ecos_EXTRA_LIBS} -nostdlib -nostartfiles -L${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib -Ttarget.ld ${ECOS_LD_MCPU}")
SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <OBJECTS> -o <TARGET> ${_ecos_EXTRA_LIBS} -nostdlib -nostartfiles -L${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib -Ttarget.ld ${ECOS_LD_MCPU}") SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <OBJECTS> -o <TARGET> ${_ecos_EXTRA_LIBS} -nostdlib -nostartfiles -L${CMAKE_CURRENT_BINARY_DIR}/ecos/install/lib -Ttarget.ld ${ECOS_LD_MCPU}")
# some strict compiler flags
SET (CMAKE_C_FLAGS "-Wstrict-prototypes")
SET (CMAKE_CXX_FLAGS "-Woverloaded-virtual -fno-rtti -Wctor-dtor-privacy -fno-strict-aliasing -fno-exceptions")
ADD_EXECUTABLE(${_exe_NAME} ${ARGN}) ADD_EXECUTABLE(${_exe_NAME} ${ARGN})
SET_TARGET_PROPERTIES(${_exe_NAME} PROPERTIES SUFFIX ".elf") SET_TARGET_PROPERTIES(${_exe_NAME} PROPERTIES SUFFIX ".elf")
@ -192,7 +188,7 @@ MACRO(ECOS_ADD_EXECUTABLE _exe_NAME )
TARGET ${_exe_NAME} TARGET ${_exe_NAME}
POST_BUILD POST_BUILD
COMMAND ${ECOS_ARCH_PREFIX}objcopy COMMAND ${ECOS_ARCH_PREFIX}objcopy
ARGS -O binary ${_exe_NAME}.elf ${_exe_NAME}.bin ARGS -O binary ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.elf ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.bin
) )
#and an srec file #and an srec file
@ -200,15 +196,13 @@ MACRO(ECOS_ADD_EXECUTABLE _exe_NAME )
TARGET ${_exe_NAME} TARGET ${_exe_NAME}
POST_BUILD POST_BUILD
COMMAND ${ECOS_ARCH_PREFIX}objcopy COMMAND ${ECOS_ARCH_PREFIX}objcopy
ARGS -O srec ${_exe_NAME}.elf ${_exe_NAME}.srec ARGS -O srec ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.elf ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.srec
) )
#add the created files to the make_clean_files #add the created files to the clean-files
SET(ECOS_ADD_MAKE_CLEAN_FILES ${ECOS_ADD_MAKE_CLEAN_FILES};${_exe_NAME}.bin;${_exe_NAME}.srec;${_exe_NAME}.lst;)
SET_DIRECTORY_PROPERTIES( SET_DIRECTORY_PROPERTIES(
PROPERTIES PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES "${ECOS_ADD_MAKE_CLEAN_FILES}" ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.bin;${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.srec;${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst;"
) )
#cd $1; ls -a | grep --invert-match -e "\(.*CVS\)\|\(.*ecos\.ecc\)" | xargs rm -rf; touch ecos.ecc #cd $1; ls -a | grep --invert-match -e "\(.*CVS\)\|\(.*ecos\.ecc\)" | xargs rm -rf; touch ecos.ecc
@ -220,12 +214,12 @@ MACRO(ECOS_ADD_EXECUTABLE _exe_NAME )
ADD_CUSTOM_TARGET( listing ADD_CUSTOM_TARGET( listing
COMMAND echo -e \"\\n--- Symbols sorted by address ---\\n\" > ${_exe_NAME}.lst COMMAND echo -e \"\\n--- Symbols sorted by address ---\\n\" > ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst
COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -n ${_exe_NAME}.elf >> ${_exe_NAME}.lst COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -n ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.elf >> ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst
COMMAND echo -e \"\\n--- Symbols sorted by size ---\\n\" >> ${_exe_NAME}.lst COMMAND echo -e \"\\n--- Symbols sorted by size ---\\n\" >> ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst
COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -r --size-sort ${_exe_NAME}.elf >> ${_exe_NAME}.lst COMMAND ${ECOS_ARCH_PREFIX}nm -S -C -r --size-sort ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.elf >> ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst
COMMAND echo -e \"\\n--- Full assembly listing ---\\n\" >> ${_exe_NAME}.lst COMMAND echo -e \"\\n--- Full assembly listing ---\\n\" >> ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst
COMMAND ${ECOS_ARCH_PREFIX}objdump -S -x -d -C ${_exe_NAME}.elf >> ${_exe_NAME}.lst ) COMMAND ${ECOS_ARCH_PREFIX}objdump -S -x -d -C ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.elf >> ${CMAKE_CURRENT_BINARY_DIR}/${_exe_NAME}.lst )
ENDMACRO(ECOS_ADD_EXECUTABLE) ENDMACRO(ECOS_ADD_EXECUTABLE)