summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-23 14:27:20 -0200
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-01-23 18:23:41 +0100
commitfe7a21170c5aa568425556c1b33d240bd13bc17c (patch)
tree466f11c7bbd5fe0a5f055e81a33d2959ce9bd63c
parentb10fc88bb0d5c6c31a797ab4e2010cdcac37b903 (diff)
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.
-rw-r--r--cmake/config/common.cmake10
-rw-r--r--src/lib/efl/config.h.cmake10
2 files changed, 6 insertions, 14 deletions
diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index 2ec590a7e8..11e45b0002 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -7,14 +7,6 @@ find_package(Threads REQUIRED)
7 7
8pkg_check_modules(CHECK check) 8pkg_check_modules(CHECK check)
9 9
10set(VMAJ ${PROJECT_VERSION_MAJOR})
11set(VMIN ${PROJECT_VERSION_MINOR})
12set(VMIC ${PROJECT_VERSION_PATCH})
13set(VREV ${PROJECT_VERSION_TWEAK})
14set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
15set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
16set(MODULE_ARCH "v-${VMAJ}.${VMIN}")
17
18EFL_OPTION(BUILD_PROFILE "How to build EFL" dev CHOICE release;dev;debug) 10EFL_OPTION(BUILD_PROFILE "How to build EFL" dev CHOICE release;dev;debug)
19EFL_OPTION(EFL_NOLEGACY_API_SUPPORT "Whenever to disable non-Eo (Legacy) APIs" ON) 11EFL_OPTION(EFL_NOLEGACY_API_SUPPORT "Whenever to disable non-Eo (Legacy) APIs" ON)
20EFL_OPTION(EFL_EO_API_SUPPORT "Whenever to enable new Eo APIs" ON) 12EFL_OPTION(EFL_EO_API_SUPPORT "Whenever to enable new Eo APIs" ON)
@@ -34,4 +26,4 @@ set(EFL_BETA_API_SUPPORT 1)
34 26
35if (CMAKE_THREAD_LIBS_INIT) 27if (CMAKE_THREAD_LIBS_INIT)
36 set(EFL_HAVE_THREADS 1) 28 set(EFL_HAVE_THREADS 1)
37endif() \ No newline at end of file 29endif()
diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake
index a7fd4bc4cf..f664e52665 100644
--- a/src/lib/efl/config.h.cmake
+++ b/src/lib/efl/config.h.cmake
@@ -5,10 +5,10 @@
5 5
6#include "config_headers.h" 6#include "config_headers.h"
7 7
8#define VMAJ @VMAJ@ 8#define VMAJ @PROJECT_VERSION_MAJOR@
9#define VMIN @VMIN@ 9#define VMIN @PROJECT_VERSION_MINOR@
10#define VMIC @VMIC@ 10#define VMIC @PROJECT_VERSION_PATCH@
11#define VREV @VREV@ 11#define VREV @PROJECT_VERSION_TWEAK@
12 12
13#cmakedefine NVALGRIND 1 13#cmakedefine NVALGRIND 1
14 14
@@ -16,7 +16,7 @@
16#cmakedefine EINA_STATIC_BUILD_ONE_BIG 1 16#cmakedefine EINA_STATIC_BUILD_ONE_BIG 1
17#cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1 17#cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1
18 18
19#define MODULE_ARCH "@MODULE_ARCH@" 19#define MODULE_ARCH "v-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@"
20#define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@" 20#define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
21#define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@" 21#define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@"
22 22