NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: reduce number of redundant variables set in cmake. 

Avoid redundant variables in cmake, whenever they are needed as
duplicates, only do that in the template.
This commit is contained in:
Gustavo Sverzut Barbieri 2017-01-23 14:27:20 -02:00 committed by Marcel Hollerbach
parent b10fc88bb0
commit fe7a21170c
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/config/common.cmake
View File

@ -7,14 +7,6 @@ find_package(Threads REQUIRED)
pkg_check_modules(CHECK check)
set(VMAJ ${PROJECT_VERSION_MAJOR})
set(VMIN ${PROJECT_VERSION_MINOR})
set(VMIC ${PROJECT_VERSION_PATCH})
set(VREV ${PROJECT_VERSION_TWEAK})
set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(MODULE_ARCH "v-${VMAJ}.${VMIN}")
EFL_OPTION(BUILD_PROFILE "How to build EFL" dev CHOICE release;dev;debug)
EFL_OPTION(EFL_NOLEGACY_API_SUPPORT "Whenever to disable non-Eo (Legacy) APIs" ON)
EFL_OPTION(EFL_EO_API_SUPPORT "Whenever to enable new Eo APIs" ON)
@ -34,4 +26,4 @@ set(EFL_BETA_API_SUPPORT 1)
if (CMAKE_THREAD_LIBS_INIT)
set(EFL_HAVE_THREADS 1)
endif()
endif()

10
src/lib/efl/config.h.cmake
View File

@ -5,10 +5,10 @@
#include "config_headers.h"
#define VMAJ @VMAJ@
#define VMIN @VMIN@
#define VMIC @VMIC@
#define VREV @VREV@
#define VMAJ @PROJECT_VERSION_MAJOR@
#define VMIN @PROJECT_VERSION_MINOR@
#define VMIC @PROJECT_VERSION_PATCH@
#define VREV @PROJECT_VERSION_TWEAK@
#cmakedefine NVALGRIND 1
@ -16,7 +16,7 @@
#cmakedefine EINA_STATIC_BUILD_ONE_BIG 1
#cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1
#define MODULE_ARCH "@MODULE_ARCH@"
#define MODULE_ARCH "v-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@"
#define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
#define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@"