Peter M. Groen / dali-demo

Commit 4609d40d2df87b679016d3dc4debae933b760689

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 93853d07 b763deb9

Merge "Updates after DALi library name changes" into devel/master

Inline Side-by-side
Showing 3 changed files with 15 additions and 15 deletions
build/android/app/src/main/cpp/CMakeLists.txt
  View file @4609d40
@@ -35,9 +35,9 @@ ELSE() @@ -35,9 +35,9 @@ ELSE()
35 ENDIF() 35 ENDIF()
36 36
37 IF(EXISTS "${DALI_ENV_DIR}") 37 IF(EXISTS "${DALI_ENV_DIR}")
38 - PKG_CHECK_MODULES(DALI_CORE dali-core REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)  
39 - PKG_CHECK_MODULES(DALI_ADAPTOR dali-adaptor REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)  
40 - PKG_CHECK_MODULES(DALI_TOOLKIT dali-toolkit REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH) 38 + PKG_CHECK_MODULES(DALI_CORE dali2-core REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
  39 + PKG_CHECK_MODULES(DALI_ADAPTOR dali2-adaptor REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
  40 + PKG_CHECK_MODULES(DALI_TOOLKIT dali2-toolkit REQUIRED NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH)
41 ELSE() 41 ELSE()
42 MESSAGE(WARNING "${DALI_ENV_DIR} not found!") 42 MESSAGE(WARNING "${DALI_ENV_DIR} not found!")
43 ENDIF() 43 ENDIF()
build/tizen/CMakeLists.txt
  View file @4609d40
@@ -166,9 +166,9 @@ ENDFOREACH(flag) @@ -166,9 +166,9 @@ ENDFOREACH(flag)
166 MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/images") 166 MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/images")
167 167
168 IF( ENABLE_PKG_CONFIGURE ) 168 IF( ENABLE_PKG_CONFIGURE )
169 - SET(PKG_LIST dali-core  
170 - dali-adaptor  
171 - dali-toolkit) 169 + SET(PKG_LIST dali2-core
  170 + dali2-adaptor
  171 + dali2-toolkit)
172 172
173 INCLUDE(FindPkgConfig) 173 INCLUDE(FindPkgConfig)
174 pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST}) 174 pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST})
@@ -200,9 +200,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. @@ -200,9 +200,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
200 FIND_PACKAGE( unofficial-cairo REQUIRED ) 200 FIND_PACKAGE( unofficial-cairo REQUIRED )
201 201
202 FIND_PACKAGE( dali-windows-dependencies REQUIRED ) 202 FIND_PACKAGE( dali-windows-dependencies REQUIRED )
203 - FIND_PACKAGE( dali-core REQUIRED )  
204 - FIND_PACKAGE( dali-adaptor REQUIRED )  
205 - FIND_PACKAGE( dali-toolkit REQUIRED ) 203 + FIND_PACKAGE( dali2-core REQUIRED )
  204 + FIND_PACKAGE( dali2-adaptor REQUIRED )
  205 + FIND_PACKAGE( dali2-toolkit REQUIRED )
206 206
207 # Set up the include dir 207 # Set up the include dir
208 SET( INCLUDE_DIR $ENV{includedir} ) 208 SET( INCLUDE_DIR $ENV{includedir} )
@@ -238,9 +238,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc. @@ -238,9 +238,9 @@ IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
238 unofficial::angle::libGLESv2 238 unofficial::angle::libGLESv2
239 unofficial::cairo::cairo 239 unofficial::cairo::cairo
240 dali-windows-dependencies::dali-windows-dependencies 240 dali-windows-dependencies::dali-windows-dependencies
241 - dali-core::dali-core  
242 - dali-adaptor::dali-adaptor  
243 - dali-toolkit::dali-toolkit 241 + dali2-core::dali2-core
  242 + dali2-adaptor::dali2-adaptor
  243 + dali2-toolkit::dali2-toolkit
244 ) 244 )
245 ELSEIF( UNIX ) 245 ELSEIF( UNIX )
246 SET( REQUIRED_LIBS 246 SET( REQUIRED_LIBS
packaging/com.samsung.dali-demo.spec
  View file @4609d40
@@ -18,9 +18,9 @@ BuildRequires: pkgconfig(capi-appfw-application) @@ -18,9 +18,9 @@ BuildRequires: pkgconfig(capi-appfw-application)
18 BuildRequires: pkgconfig(capi-media-player) 18 BuildRequires: pkgconfig(capi-media-player)
19 BuildRequires: pkgconfig(dlog) 19 BuildRequires: pkgconfig(dlog)
20 BuildRequires: gettext-tools 20 BuildRequires: gettext-tools
21 -BuildRequires: pkgconfig(dali-core)  
22 -BuildRequires: pkgconfig(dali-adaptor)  
23 -BuildRequires: pkgconfig(dali-toolkit) 21 +BuildRequires: pkgconfig(dali2-core)
  22 +BuildRequires: pkgconfig(dali2-adaptor)
  23 +BuildRequires: pkgconfig(dali2-toolkit)
24 BuildRequires: pkgconfig(libtzplatform-config) 24 BuildRequires: pkgconfig(libtzplatform-config)
25 25
26 %description 26 %description