summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-01-23 15:51:30 +0100
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-01-23 18:23:40 +0100
commit34074fd0e729760edaa4fad5aad943cf1b791aad (patch)
treea447c7892db7223f28f315d1905e4952f4a3df1c
parent6c87f62b90b1edd12087b7bdce78883b5d52c5e9 (diff)
build: use CMAKE defined variables
-rw-r--r--cmake/config/common.cmake7
-rw-r--r--src/lib/efl/config.h.cmake3
2 files changed, 2 insertions, 8 deletions
diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake
index 270463d7b0..2ec590a7e8 100644
--- a/cmake/config/common.cmake
+++ b/cmake/config/common.cmake
@@ -15,13 +15,6 @@ set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
15set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR}) 15set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
16set(MODULE_ARCH "v-${VMAJ}.${VMIN}") 16set(MODULE_ARCH "v-${VMAJ}.${VMIN}")
17 17
18#change when on windows
19if (WIN32)
20 set(SHARED_LIB_SUFFIX ".dll")
21else()
22 set(SHARED_LIB_SUFFIX ".so")
23endif()
24
25EFL_OPTION(BUILD_PROFILE "How to build EFL" dev CHOICE release;dev;debug) 18EFL_OPTION(BUILD_PROFILE "How to build EFL" dev CHOICE release;dev;debug)
26EFL_OPTION(EFL_NOLEGACY_API_SUPPORT "Whenever to disable non-Eo (Legacy) APIs" ON) 19EFL_OPTION(EFL_NOLEGACY_API_SUPPORT "Whenever to disable non-Eo (Legacy) APIs" ON)
27EFL_OPTION(EFL_EO_API_SUPPORT "Whenever to enable new Eo APIs" ON) 20EFL_OPTION(EFL_EO_API_SUPPORT "Whenever to enable new Eo APIs" ON)
diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake
index 2331f4ba5a..a7fd4bc4cf 100644
--- a/src/lib/efl/config.h.cmake
+++ b/src/lib/efl/config.h.cmake
@@ -17,7 +17,8 @@
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 "@MODULE_ARCH@"
20#define SHARED_LIB_SUFFIX "@SHARED_LIB_SUFFIX@" 20#define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@"
21#define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@"
21 22
22#if defined (HAVE_LISTXATTR) && defined (HAVE_SETXATTR) && defined (HAVE_GETXATTR) 23#if defined (HAVE_LISTXATTR) && defined (HAVE_SETXATTR) && defined (HAVE_GETXATTR)
23#define HAVE_XATTR 24#define HAVE_XATTR