cmake: move PACKAGE defines into a sane place

this should support all the vars used in all efl subsystems
This commit is contained in:
Marcel Hollerbach 2017-01-21 12:12:57 +01:00
parent 76e68de5d6
commit fe1863e30d
3 changed files with 9 additions and 6 deletions

View File

@ -1,5 +1,8 @@
cmake_minimum_required(VERSION 3.7)
project(efl VERSION 1.19.99.1)
include(GNUInstallDirs)
if (NOT EFL_BUILD_ID)
set(EFL_BUILD_ID 120)
endif()
@ -11,15 +14,15 @@ endif()
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" CACHE PATH "Path to store built libraries")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" CACHE PATH "Path to store built executables")
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Absolute path to library installation directory")
set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Absolute path to executable installation directory")
set(HEADER_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Absolute path to install headers by the library")
add_definitions(
"-DHAVE_CONFIG_H"
"-DLIB_INSTALL_DIR=\"${LIB_INSTALL_DIR}\""
"-DEXEC_INSTALL_DIR=\"${EXEC_INSTALL_DIR}\""
"-DPACKAGE_BIN_DIR=\"${CMAKE_INSTALL_FULL_BINDIR}\""
"-DPACKAGE_LIB_DIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\""
"-DPACKAGE_BUILD_DIR=\"${CMAKE_SOURCE_DIR}\""
)
include_directories(
${PROJECT_SOURCE_DIR}/src/lib/efl
${PROJECT_BINARY_DIR}/src/lib/efl

View File

@ -482,7 +482,8 @@ function(EFL_LIB _target)
set_target_properties(${_target} PROPERTIES
FRAMEWORK TRUE
PUBLIC_HEADER "${_headers}"
OBJECT_DEPENDS "${_obj_deps}")
OBJECT_DEPENDS "${_obj_deps}"
COMPILE_FLAGS -DPACKAGE_DATA_DIR=\\"${CMAKE_INSTALL_FULL_DATADIR}/${_target}/\\")
if(DEPENDENCIES)
add_dependencies(${_target} ${DEPENDENCIES})

View File

@ -16,7 +16,6 @@
#cmakedefine EINA_STATIC_BUILD_ONE_BIG 1
#cmakedefine EINA_STATIC_BUILD_PASS_THROUGH 1
#define PACKAGE_LIB_DIR "bla"
#define MODULE_ARCH "bla"
#define SHARED_LIB_SUFFIX "bla"