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
common.cmake: fixed erroneous search path for os-release
[apps/app-templates.git]
/
cmake
/
common.cmake
diff --git
a/cmake/common.cmake
b/cmake/common.cmake
index
02ef1a4
..
f553ae0
100644
(file)
--- a/
cmake/common.cmake
+++ b/
cmake/common.cmake
@@
-42,7
+42,7
@@
endif()
# Used to package .deb
set(OS_RELEASE_PATH "${BUILD_ENV_SYSROOT}/etc/os-release")
if(EXISTS ${OS_RELEASE_PATH})
# Used to package .deb
set(OS_RELEASE_PATH "${BUILD_ENV_SYSROOT}/etc/os-release")
if(EXISTS ${OS_RELEASE_PATH})
- execute_process(COMMAND bash "-c" "grep -E '^ID(_LIKE)?='
/etc/os-release
| tail -n 1"
+ execute_process(COMMAND bash "-c" "grep -E '^ID(_LIKE)?='
${OS_RELEASE_PATH}
| tail -n 1"
OUTPUT_VARIABLE TMP_OSRELEASE
)
OUTPUT_VARIABLE TMP_OSRELEASE
)
@@
-52,7
+52,7
@@
if(EXISTS ${OS_RELEASE_PATH})
else()
set(OSRELEASE "NOT COMPATIBLE !")
endif()
else()
set(OSRELEASE "NOT COMPATIBLE !")
endif()
-elseif(
${BUILD_ENV_SYSROOT} == $ENV{PKG_CONFIG_SYSROOT_DIR}
)
+elseif(
"${BUILD_ENV_SYSROOT}" STREQUAL "$ENV{PKG_CONFIG_SYSROOT_DIR}"
)
set(OSRELEASE "yocto-build")
else()
set(OSRELEASE "NOT COMPATIBLE ! Missing ${OS_RELEASE_PATH} file.")
set(OSRELEASE "yocto-build")
else()
set(OSRELEASE "NOT COMPATIBLE ! Missing ${OS_RELEASE_PATH} file.")
@@
-85,6
+85,9
@@
foreach(file ${system_cmakefiles} ${home_cmakefiles} ${project_cmakefiles})
include(${file})
endforeach()
include(${file})
endforeach()
+set_install_prefix()
+prevent_in_source_build()
+
if(DEFINED PROJECT_SRC_DIR_PATTERN)
project_subdirs_add(${PROJECT_SRC_DIR_PATTERN})
else()
if(DEFINED PROJECT_SRC_DIR_PATTERN)
project_subdirs_add(${PROJECT_SRC_DIR_PATTERN})
else()