jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge cmake configured headers into one config.h.in

Browse source 
This looks better than leave cmake *.in everywhere in the tree.
Also fix typo according to review comments of PR 425.
This commit is contained in:
王振华 (WANG Zhenhua) 2017-08-28 14:55:46 +08:00
commit f203a75010
20 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -105,14 +105,11 @@ endif()
if (ANBOX_VERSION_SUFFIX)
set(ANBOX_VERSION "${ANBOX_VERSION}-${ANBOX_VERSION_SUFFIX}")
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/version.h.in
${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/version.h)
set(ANBOX_RESOURCE_DIR "${CMAKE_INSTALL_DATADIR}/anbox")
set(ANBOX_RESOURCE_DIR_FULL "${CMAKE_INSTALL_FULL_DATADIR}/anbox")
set(ANBOX_STATEDIR_FULL "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/anbox")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/config.h.in
${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/config.h)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h.in
${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h)
add_subdirectory(external)
add_subdirectory(src)