summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2012-04-16 16:02:41 +0000
committerTom Hacohen <tom@stosb.com>2012-04-16 16:02:41 +0000
commit154e1b6f1b1cf1e8b8bee647bb0d0295cf1ff0b6 (patch)
tree9c1799f3e80906eea172d31e416ffec8fe64193a /legacy
parent7bcda618a2e8f723c61778b2eda4883d6c4f6319 (diff)
Eobj: Improved config.h a bit and fixed a pkg-config error.
SVN revision: 70236
Diffstat (limited to 'legacy')
-rw-r--r--legacy/eobj/CMakeLists.txt9
-rw-r--r--legacy/eobj/cmakeconfig.h.in10
-rw-r--r--legacy/eobj/eobj.pc.in4
3 files changed, 12 insertions, 11 deletions
diff --git a/legacy/eobj/CMakeLists.txt b/legacy/eobj/CMakeLists.txt
index 57d241cf28..2de716961a 100644
--- a/legacy/eobj/CMakeLists.txt
+++ b/legacy/eobj/CMakeLists.txt
@@ -1,9 +1,9 @@
1cmake_minimum_required(VERSION 2.6) 1cmake_minimum_required(VERSION 2.6)
2project(eobj) 2project(eobj)
3set(EOBJ_VERSION_MAJOR 0) 3set(VMAJ 0)
4set(EOBJ_VERSION_MINOR 1) 4set(VMIN 1)
5set(EOBJ_VERSION_MICRO 0) 5set(VMIC 0)
6set(EOBJ_VERSION ${EOBJ_VERSION_MAJOR}.${EOBJ_VERSION_MINOR}.${EOBJ_VERSION_MICRO}) 6set(PACKAGE_VERSION ${VMAJ}.${VMIN}.${VMIC})
7 7
8set(PACKAGE ${CMAKE_PROJECT_NAME}) 8set(PACKAGE ${CMAKE_PROJECT_NAME})
9set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") 9set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@@ -55,6 +55,7 @@ add_subdirectory(doc)
55CONFIGURE_FILE( 55CONFIGURE_FILE(
56 "${PROJECT_SOURCE_DIR}/eobj.pc.in" 56 "${PROJECT_SOURCE_DIR}/eobj.pc.in"
57 "${PROJECT_BINARY_DIR}/eobj.pc" 57 "${PROJECT_BINARY_DIR}/eobj.pc"
58 @ONLY
58 ) 59 )
59 60
60INSTALL(FILES "${PROJECT_BINARY_DIR}/eobj.pc" 61INSTALL(FILES "${PROJECT_BINARY_DIR}/eobj.pc"
diff --git a/legacy/eobj/cmakeconfig.h.in b/legacy/eobj/cmakeconfig.h.in
index aeccf65ff7..332ef03f60 100644
--- a/legacy/eobj/cmakeconfig.h.in
+++ b/legacy/eobj/cmakeconfig.h.in
@@ -1,9 +1,9 @@
1#define PACKAGE "@CMAKE_PROJECT_NAME@" 1#define PACKAGE "@PACKAGE@"
2#define PACKAGE_NAME PACKAGE 2#define PACKAGE_NAME PACKAGE
3#define VERSION "@EOBJ_VERSION@" 3#define VERSION "@PACKAGE_VERSION@"
4#define VMAJ @EOBJ_VERSION_MAJOR@ 4#define VMAJ @VMAJ@
5#define VMIN @EOBJ_VERSION_MINOR@ 5#define VMIN @VMIN@
6#define VMIC @EOBJ_VERSION_MICRO@ 6#define VMIC @VMIC@
7 7
8#cmakedefine HAVE___ATTRIBUTE__ 8#cmakedefine HAVE___ATTRIBUTE__
9#ifdef HAVE___ATTRIBUTE__ 9#ifdef HAVE___ATTRIBUTE__
diff --git a/legacy/eobj/eobj.pc.in b/legacy/eobj/eobj.pc.in
index 09759ecde3..61f1697103 100644
--- a/legacy/eobj/eobj.pc.in
+++ b/legacy/eobj/eobj.pc.in
@@ -5,9 +5,9 @@ includedir=${prefix}/include
5 5
6Name: Eobj 6Name: Eobj
7Description: EFL's generic object system library. 7Description: EFL's generic object system library.
8Version: @EOBJ_VERSION@ 8Version: @PACKAGE_VERSION@
9Libs: -L${libdir} -leobj 9Libs: -L${libdir} -leobj
10Libs.private: 10Libs.private:
11Cflags: -I${includedir}/eobj-@EOBJ_VERSION_MAJOR@ 11Cflags: -I${includedir}/eobj-@VMAJ@
12 12
13~ 13~