From 34074fd0e729760edaa4fad5aad943cf1b791aad Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 23 Jan 2017 15:51:30 +0100 Subject: [PATCH] build: use CMAKE defined variables --- cmake/config/common.cmake | 7 ------- src/lib/efl/config.h.cmake | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmake/config/common.cmake b/cmake/config/common.cmake index 270463d..2ec590a 100644 --- a/cmake/config/common.cmake +++ b/cmake/config/common.cmake @@ -15,13 +15,6 @@ set(EFL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(EFL_VERSION_MINOR ${PROJECT_VERSION_MINOR}) set(MODULE_ARCH "v-${VMAJ}.${VMIN}") -#change when on windows -if (WIN32) - set(SHARED_LIB_SUFFIX ".dll") -else() - set(SHARED_LIB_SUFFIX ".so") -endif() - 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) diff --git a/src/lib/efl/config.h.cmake b/src/lib/efl/config.h.cmake index 2331f4b..a7fd4bc 100644 --- a/src/lib/efl/config.h.cmake +++ b/src/lib/efl/config.h.cmake @@ -17,7 +17,8 @@ #cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1 #define MODULE_ARCH "@MODULE_ARCH@" -#define SHARED_LIB_SUFFIX "@SHARED_LIB_SUFFIX@" +#define SHARED_LIB_SUFFIX "@CMAKE_SHARED_LIBRARY_SUFFIX@" +#define EXEEXT "@CMAKE_EXECUTABLE_SUFFIX@" #if defined (HAVE_LISTXATTR) && defined (HAVE_SETXATTR) && defined (HAVE_GETXATTR) #define HAVE_XATTR -- 2.7.4