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

Eobj: Improved config.h a bit and fixed a pkg-config error. 

SVN revision: 70236
This commit is contained in:
Tom Hacohen 2012-04-16 16:02:41 +00:00
parent 7bcda618a2
commit 154e1b6f1b
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/eobj/CMakeLists.txt
View File

@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(eobj) project(eobj)
set(EOBJ_VERSION_MAJOR 0) set(VMAJ 0)
set(EOBJ_VERSION_MINOR 1) set(VMIN 1)
set(EOBJ_VERSION_MICRO 0) set(VMIC 0)
set(EOBJ_VERSION ${EOBJ_VERSION_MAJOR}.${EOBJ_VERSION_MINOR}.${EOBJ_VERSION_MICRO}) set(PACKAGE_VERSION ${VMAJ}.${VMIN}.${VMIC})
set(PACKAGE ${CMAKE_PROJECT_NAME}) set(PACKAGE ${CMAKE_PROJECT_NAME})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@ -55,6 +55,7 @@ add_subdirectory(doc)
CONFIGURE_FILE( CONFIGURE_FILE(
"${PROJECT_SOURCE_DIR}/eobj.pc.in" "${PROJECT_SOURCE_DIR}/eobj.pc.in"
"${PROJECT_BINARY_DIR}/eobj.pc" "${PROJECT_BINARY_DIR}/eobj.pc"
@ONLY
) )
INSTALL(FILES "${PROJECT_BINARY_DIR}/eobj.pc" INSTALL(FILES "${PROJECT_BINARY_DIR}/eobj.pc"

10
legacy/eobj/cmakeconfig.h.in
View File

@ -1,9 +1,9 @@
#define PACKAGE "@CMAKE_PROJECT_NAME@" #define PACKAGE "@PACKAGE@"
#define PACKAGE_NAME PACKAGE #define PACKAGE_NAME PACKAGE
#define VERSION "@EOBJ_VERSION@" #define VERSION "@PACKAGE_VERSION@"
#define VMAJ @EOBJ_VERSION_MAJOR@ #define VMAJ @VMAJ@
#define VMIN @EOBJ_VERSION_MINOR@ #define VMIN @VMIN@
#define VMIC @EOBJ_VERSION_MICRO@ #define VMIC @VMIC@
#cmakedefine HAVE___ATTRIBUTE__ #cmakedefine HAVE___ATTRIBUTE__
#ifdef HAVE___ATTRIBUTE__ #ifdef HAVE___ATTRIBUTE__

4
legacy/eobj/eobj.pc.in
View File

@ -5,9 +5,9 @@ includedir=${prefix}/include
Name: Eobj Name: Eobj
Description: EFL's generic object system library. Description: EFL's generic object system library.
Version: @EOBJ_VERSION@ Version: @PACKAGE_VERSION@
Libs: -L${libdir} -leobj Libs: -L${libdir} -leobj
Libs.private: Libs.private:
Cflags: -I${includedir}/eobj-@EOBJ_VERSION_MAJOR@ Cflags: -I${includedir}/eobj-@VMAJ@
~ ~