summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-25 02:04:13 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-08-25 02:04:13 +0200
commit28dcbc3a2c7fef8988d71862653f95cf455c97c9 (patch)
tree2a2ec2149f08e7380621cadae0eb860ef00adbbd
parent73f75d57e84f00830fd82d7cb76ee8c83f7fc6c7 (diff)
Generic default CLOSING_MESSAGE in sample config
Change-Id: I6886b4d7844e208f3f996418d9658567e8d8f135 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--cmake/cmake.d/03-macros.cmake4
-rw-r--r--cmake/cmake.d/04-extra_targets.cmake9
-rw-r--r--samples.d/config.cmake.sample26
3 files changed, 15 insertions, 24 deletions
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 45d1ef5..0bab354 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -495,7 +495,7 @@ macro(project_closing_msg)
add_custom_target(${PROJECT_NAME}_build_done ALL
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
)
- add_dependencies(${PROJECT_NAME}_build_done
- ${DEPENDENCIES_TARGET} ${PROJECT_TARGETS})
+ add_dependencies(${PROJECT_NAME}_build_done
+ ${PROJECT_TARGETS} populate)
endif()
endmacro()
diff --git a/cmake/cmake.d/04-extra_targets.cmake b/cmake/cmake.d/04-extra_targets.cmake
index d54e128..4e7921a 100644
--- a/cmake/cmake.d/04-extra_targets.cmake
+++ b/cmake/cmake.d/04-extra_targets.cmake
@@ -24,15 +24,6 @@
# Customise your preferences in "./conf.d/cmake/config.cmake"
#--------------------------------------------------------------------------
-# Add a dummy target to enable global dependency order
-# -----------------------------------------------------
-if(EXTRA_DEPENDENCIES_ORDER)
- set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies)
- add_custom_target(${DEPENDENCIES_TARGET} ALL
- DEPENDS ${EXTRA_DEPENDENCY_ORDER}
- )
-endif()
-
# ----------------------------------------------------------------------------
# Archive target
# ----------------------------------------------------------------------------
diff --git a/samples.d/config.cmake.sample b/samples.d/config.cmake.sample
index 393c893..2497ee2 100644
--- a/samples.d/config.cmake.sample
+++ b/samples.d/config.cmake.sample
@@ -74,6 +74,11 @@ set (PKG_REQUIRED_LIST
libmicrohttpd>=0.9.55
)
+# Prefix path where will be installed the files
+# Default: /usr/local (need root permission to write in)
+# ------------------------------------------------------
+#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+
# Customize link option
# -----------------------------
#list(APPEND link_libraries -an-option)
@@ -120,16 +125,6 @@ set (PKG_REQUIRED_LIST
# -O2
# CACHE STRING "Compilation flags for RELEASE build type.")
-# Print a helper message when every thing is finished
-# ----------------------------------------------------
-#set(CLOSING_MESSAGE "")
-#set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
-
-# Prefix path where will be installed the files
-# Default: /usr/local (need root permission to write in)
-# ------------------------------------------------------
-#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
-
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
# ---------------------------------------------------------------------
set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
@@ -187,13 +182,18 @@ set(WIDGET_ENTRY_POINT EntryPoint_Path_Not_Set)
# Optional Application Framework security token
# and port use for remote debugging.
#------------------------------------------------------------
-#set(AFB_TOKEN "" CACHE PATH "Default AFB_TOKEN")
-#set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")
+set(AFB_TOKEN "" CACHE PATH "Default binder security token")
+set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port")
+
+# Print a helper message when every thing is finished
+# ----------------------------------------------------
+set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --port=${AFB_REMPORT} --workdir=${CMAKE_BINARY_DIR}/package --ldpaths=lib --roothttp=htdocs --token=\"${AFB_TOKEN}\" --tracereq=common --verbose")
+set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
# Optional schema validator about now only XML, LUA and JSON
# are supported
#------------------------------------------------------------
-#set(LUA_CHECKER "luac -o /dev/null" CACHE STRING "LUA compiler")
+#set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler")
#set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
#set(JSON_CHECKER "json_verify" CACHE STRING "JSON linter")