Code Review
/
apps
/
app-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Control install destination directory
[apps/app-templates.git]
/
cmake
/
cmake.d
/
03-macros.cmake
diff --git
a/cmake/cmake.d/03-macros.cmake
b/cmake/cmake.d/03-macros.cmake
index
fa4bd1f
..
6c87d95
100644
(file)
--- a/
cmake/cmake.d/03-macros.cmake
+++ b/
cmake/cmake.d/03-macros.cmake
@@
-238,10
+238,18
@@
macro(project_targets_populate)
COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
COMMAND mkdir -p ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
add_custom_target(populate DEPENDS ${PACKAGE_BINDIR} ${PACKAGE_ETCDIR} ${PACKAGE_LIBDIR} ${PACKAGE_HTTPDIR} ${PACKAGE_DATADIR})
+ # Dirty trick to define a default INSTALL command for app-templates handled
+ # targets
INSTALL(CODE "execute_process(COMMAND make populate)")
INSTALL(CODE "execute_process(COMMAND make populate)")
- INSTALL(DIRECTORY ${PROJECT_PKG_BUILD_DIR}/
- DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}
- )
+ if(NO_DEDICATED_INSTALL_DIR)
+ INSTALL(DIRECTORY ${PROJECT_PKG_BUILD_DIR}/
+ DESTINATION ${CMAKE_INSTALL_PREFIX}
+ )
+ else()
+ INSTALL(DIRECTORY ${PROJECT_PKG_BUILD_DIR}/
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}
+ )
+ endif()
get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
foreach(TARGET ${PROJECT_TARGETS})
get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
foreach(TARGET ${PROJECT_TARGETS})