summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-01-21 16:16:02 +0100
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-01-23 18:23:40 +0100
commit40cb00dc57216308ce99f6e7e39fd04f5513a866 (patch)
treecfd721e6f7de91fb646f96b538dbbec573a70d1c
parent8df6ac453d71409f767de147726087b22969c2bf (diff)
build: set MODULE_ARCH correctly
-rw-r--r--cmake/config/common.cmake1
-rw-r--r--src/lib/efl/config.h.cmake2
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index 4f01d1397a..87e792d1aa 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -15,6 +15,7 @@ set(VMIC ${PROJECT_VERSION_PATCH})
15set(VREV ${PROJECT_VERSION_TWEAK}) 15set(VREV ${PROJECT_VERSION_TWEAK})
16set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) 16set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
17set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR}) 17set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
18set(MODULE_ARCH "v-${VMAJ}.${VMIN}")
18 19
19EFL_OPTION(BUILD_PROFILE "How to build EFL" release CHOICE release;dev;debug) 20EFL_OPTION(BUILD_PROFILE "How to build EFL" release CHOICE release;dev;debug)
20 21
diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake
index 3a1e6a3b4b..7b26ea35ca 100644
--- a/src/lib/efl/config.h.cmake
+++ b/src/lib/efl/config.h.cmake
@@ -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 "bla" 19#define MODULE_ARCH "@MODULE_ARCH@"
20#define SHARED_LIB_SUFFIX "bla" 20#define SHARED_LIB_SUFFIX "bla"
21 21
22#endif 22#endif