Thanks to visit codestin.com
Credit goes to github.com

Skip to content

cmake: Support for extra defines supplied in command line #1404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fwsGonzo merged 1 commit into from
Jul 7, 2017
Merged

cmake: Support for extra defines supplied in command line #1404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion cmake/post.service.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ set_target_properties(service PROPERTIES OUTPUT_NAME ${BINARY})
# DRIVERS / PLUGINS - support for parent cmake list specification
#

# Add extra drivers defined from command line
set(DRIVERS ${DRIVERS} ${EXTRA_DRIVERS})
if(DRIVERS)
list(REMOVE_DUPLICATES DRIVERS) # Remove duplicate drivers
endif()
# Add extra plugins defined from command line
set(PLUGINS ${PLUGINS} ${EXTRA_PLUGINS})
if(PLUGINS)
list(REMOVE_DUPLICATES PLUGINS) # Remove duplicate plugins
endif()

# Function:
# Add plugin / driver as library, set link options
function(configure_plugin type plugin_name path)
Expand Down Expand Up @@ -134,6 +145,12 @@ foreach(DEP ${DEPENDENCIES})
add_dependencies(service ${DEP_NAME})
endforeach()

# Add extra libraries defined from command line
set(LIBRARIES ${LIBRARIES} ${EXTRA_LIBRARIES})
if(LIBRARIES)
list(REMOVE_DUPLICATES LIBRARIES) # Remove duplicate libraries
endif()

# add all extra libs
foreach(LIBR ${LIBRARIES})
# if relative path but not local, use includeos lib.
Expand Down Expand Up @@ -267,8 +284,9 @@ function(add_memdisk DISK)
endfunction()

# automatically build memdisk from folder
function(diskbuilder FOLD)
function(build_memdisk FOLD)
get_filename_component(REL_PATH "${FOLD}" REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
message(STATUS ${REL_PATH})
add_custom_command(
OUTPUT memdisk.fat
COMMAND ${INSTALL_LOC}/bin/diskbuilder -o memdisk.fat ${REL_PATH}
Expand All @@ -279,6 +297,18 @@ function(diskbuilder FOLD)
add_memdisk("${CMAKE_BINARY_DIR}/memdisk.fat")
endfunction()

# build memdisk if defined
if(MEMDISK)
build_memdisk(${MEMDISK})
endif()

# call build_memdisk only if MEMDISK is not defined from command line
function(diskbuilder FOLD)
if(NOT MEMDISK)
build_memdisk(${FOLD})
endif()
endfunction()

if(TARFILE)
get_filename_component(TAR_RELPATH "${TARFILE}"
REALPATH BASE_DIR "${CMAKE_SOURCE_DIR}")
Expand Down