X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2FCMakeLists.txt;h=ac9266614bd04f7ce93014fb0c09d06cb5ff2dd0;hb=a30fa383cc53a33efd1a093070be3ccc7c01fccb;hp=fd6681a3af3a08f59297aa0cfbcecd572314f140;hpb=3c6534297bc05d97858ad6181898209e6eaba720;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index fd6681a..ac92666 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -1,12 +1,12 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.1) +CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2) CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables -SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_C_STANDARD 99) +SET(CMAKE_CXX_STANDARD 17) PROJECT(${name} CXX) SET(PKG_NAME ${name}) -SET(name "dali-adaptor") +SET(name "dali2-adaptor") SET(GCC_COMPILER_VERSION_REQUIRED "6") IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") @@ -39,7 +39,7 @@ ENDIF() GET_FILENAME_COMPONENT(ROOT_SRC_DIR ${ROOT_SRC_DIR} ABSOLUTE) # API VERSION (Not DALi release version) -SET(${name}_VERSION_MAJOR 0) +SET(${name}_VERSION_MAJOR 2) SET(${name}_VERSION_MINOR 0) SET(${name}_VERSION_PATCH 0) SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH}) @@ -48,10 +48,11 @@ SET(DALI_ADAPTOR_VERSION ${${name}_VERSION} ) IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. FIND_PACKAGE( dali-windows-dependencies REQUIRED) - FIND_PACKAGE( dali-core REQUIRED) - FIND_PATH( SYSTEM_INCLUDE_DIR "dali-windows-dependencies.h" ) + FIND_PACKAGE( dali2-core REQUIRED) ENDIF() +SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + IF( UNIX ) ADD_DEFINITIONS(-DPLATFORM_TIZEN) ADD_DEFINITIONS(-DPIC -DSTDC_HEADERS) @@ -82,17 +83,21 @@ IF( NOT INCLUDE_DIR ) ENDIF() # Set up the lib dir -IF( SET_VCPKG_INSTALL_PREFIX ) +SET( LIB_DIR $ENV{libdir} ) +IF( NOT LIB_DIR ) + SET( LIB_DIR ${CMAKE_INSTALL_LIBDIR} ) +ENDIF() +IF( NOT LIB_DIR ) SET( LIB_DIR ${PREFIX}/lib ) +ENDIF() + +# Set up the bin dir +SET( BIN_DIR $ENV{bindir} ) +IF( NOT BIN_DIR ) + SET( BIN_DIR ${CMAKE_INSTALL_BINDIR} ) +ENDIF() +IF( NOT BIN_DIR ) SET( BIN_DIR ${PREFIX}/bin ) -ELSE() - SET( LIB_DIR $ENV{libdir} ) - IF( NOT LIB_DIR ) - SET( LIB_DIR ${CMAKE_INSTALL_LIBDIR} ) - ENDIF() - IF( NOT LIB_DIR ) - SET( LIB_DIR ${PREFIX}/lib ) - ENDIF() ENDIF() IF( UNIX ) @@ -107,7 +112,7 @@ ELSEIF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. ADD_COMPILE_OPTIONS( /FIextern-definitions.h ) # Adds missing definitions. ADD_COMPILE_OPTIONS( /FIpreprocessor-definitions.h ) # ADD_COMPILE_OPTIONS( /vmg ) # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks. - ADD_COMPILE_OPTIONS( /TP ) # All files considered C++ + ADD_COMPILE_OPTIONS( /wd4251 ) # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'" ENDIF() ADD_DEFINITIONS( -DNON_POWER_OF_TWO_TEXTURES @@ -135,8 +140,8 @@ IF( ENABLE_PKG_CONFIGURE ) # Requires the following variables to be setup: # @PREFIX@ @EXEC_PREFIX@ @DALI_ADAPTOR_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@ SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} ) - SET( ADAPTOR_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali-adaptor.pc ) - SET( ADAPTOR_INTEGRATION_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali-adaptor-integration.pc ) + SET( ADAPTOR_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-adaptor.pc ) + SET( ADAPTOR_INTEGRATION_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-adaptor-integration.pc ) CONFIGURE_FILE( ${ADAPTOR_PKG_CFG_FILE}.in ${ADAPTOR_PKG_CFG_FILE} @ONLY ) CONFIGURE_FILE( ${ADAPTOR_INTEGRATION_PKG_CFG_FILE}.in ${ADAPTOR_INTEGRATION_PKG_CFG_FILE} @ONLY ) ENDIF() @@ -152,7 +157,8 @@ INCLUDE_DIRECTORIES( ${ROOT_SRC_DIR} ${PROFILE_INCLUDE_DIRECTORIES} ${THIRD_PARTY_WINDOWS_PLATFORM} - ${SYSTEM_INCLUDE_DIR} + ${VCPKG_INCLUDE_DIR} + ${INCLUDE_DIR} ) SET(LIBTYPE SHARED) @@ -172,9 +178,9 @@ ENDIF() TARGET_LINK_LIBRARIES( ${name} ${DALI_LDFLAGS} - ${REQUIRED_LIBS} - ${OPTIONAL_LIBS} - ${COVERAGE} + ${REQUIRED_LIBS} + ${OPTIONAL_LIBS} + ${COVERAGE} ) SET_TARGET_PROPERTIES( ${name} @@ -184,8 +190,13 @@ SET_TARGET_PROPERTIES( ${name} CLEAN_DIRECT_OUPUT 1 ) -# Install the library so file and symlinks IF( INSTALL_CMAKE_MODULES ) + IF( ENABLE_DEBUG ) + SET( BIN_DIR "${BIN_DIR}/debug" ) + SET( LIB_DIR "${LIB_DIR}/debug" ) + ENDIF() + + # Install the library files. INSTALL( TARGETS ${name} EXPORT ${name}-targets LIBRARY DESTINATION ${LIB_DIR} @@ -193,6 +204,7 @@ IF( INSTALL_CMAKE_MODULES ) RUNTIME DESTINATION ${BIN_DIR} ) + # Install the cmake modules. INSTALL( EXPORT ${name}-targets NAMESPACE ${name}:: @@ -205,7 +217,13 @@ IF( INSTALL_CMAKE_MODULES ) include(\${CMAKE_CURRENT_LIST_DIR}/${name}-targets.cmake) ") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${name}-config.cmake DESTINATION share/${name}) + + # Install the pdb file. + IF( ENABLE_DEBUG ) + install( FILES ${CMAKE_CURRENT_BINARY_DIR}/Debug/${name}.pdb DESTINATION ${BIN_DIR} ) + ENDIF() ELSE() + # Install the library so file and symlinks INSTALL( TARGETS ${name} DESTINATION ${LIB_DIR} ) ENDIF() @@ -360,7 +378,7 @@ IF( ENABLE_LINK_TEST ) ADD_EXECUTABLE( ${LINKER_TEST_NAME} ${LINKER_TEST_SOURCES} ) MESSAGE(STATUS "libs: ${DALICORE_LDFLAGS}") TARGET_COMPILE_OPTIONS( ${LINKER_TEST_NAME} PRIVATE -I${ROOT_SRC_DIR} ${DALICORE_CFLAGS} ) - TARGET_LINK_LIBRARIES(${LINKER_TEST_NAME} ${name} ${DALICORE_LDFLAGS} ${VCONF_LDFLAGS} ${HARFBUZZ_LDFLAGS} ) + TARGET_LINK_LIBRARIES(${LINKER_TEST_NAME} ${name} ${DALICORE_LDFLAGS} ${VCONF_LDFLAGS} ${HARFBUZZ_LDFLAGS} ${AUTOFILL_LDFLAGS} ) TARGET_INCLUDE_DIRECTORIES( ${LINKER_TEST_NAME} PRIVATE ${DALI_TEST_SUITE_DIR} ) ENDIF() @@ -376,6 +394,7 @@ MESSAGE( STATUS "Profile: ${ENABLE_PROFILE}") MESSAGE( STATUS "Data Dir (Read/Write): ${dataReadWriteDir}") MESSAGE( STATUS "Data Dir (Read Only): ${dataReadOnlyDir}") MESSAGE( STATUS "EldBus: ${eldbus_available_ENABLED}") +MESSAGE( STATUS "WebP: ${webp_available_ENABLED}") MESSAGE( STATUS "Shader Binary Cache: ${ENABLE_SHADERBINCACHE}") MESSAGE( STATUS "Network logging enabled: ${ENABLE_NETWORKLOGGING}") MESSAGE( STATUS "Font config file: ${fontConfigurationFile}") @@ -384,6 +403,7 @@ MESSAGE( STATUS "Use pkg configure: ${ENABLE_PKG_CONFIGURE}" ) MESSAGE( STATUS "Enable link test: ${ENABLE_LINK_TEST}" ) MESSAGE( STATUS "Tizen Platform Config supported ${TIZEN_PLATFORM_CONFIG_SUPPORTED_LOGMSG}") MESSAGE( STATUS "Compile flags: ${CMAKE_CXX_FLAGS}") +MESSAGE( STATUS "Compile flags: ${CMAKE_C_FLAGS}") IF( enable_feedback ) ADD_SUBDIRECTORY( plugins ) ENDIF()