Peter M. Groen / dali-demo

Commit 6af0f8f844c02f091612cc3c4e200b9a05e926a0

Authored by Victor Cebollada
1 parent 62e7c096

CMake for MS Windows command line 

Change-Id: I5a73c87ae9f6b609273ac88ed6ef041dcf3ae810
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Inline Side-by-side
Showing 8 changed files with 264 additions and 36 deletions
.gitignore
  View file @6af0f8f
... ... @@ -45,3 +45,31 @@ simple-image-wall.js
45 45 /debugsources.list
46 46 /com.samsung.dali-demo-debuginfo.manifest
47 47 /com.samsung.dali-demo-debugsource.manifest
  48 +/build/tizen/*.vcxproj
  49 +/build/tizen/*.vcxproj.filters
  50 +/build/tizen/builder/Debug/*
  51 +/build/tizen/builder/Release/*
  52 +/build/tizen/builder/*.dir
  53 +/build/tizen/builder/*.vcxproj
  54 +/build/tizen/builder/*.vcxproj.filters
  55 +/build/tizen/demo/Debug/*
  56 +/build/tizen/demo/Release/*
  57 +/build/tizen/demo/*.dir
  58 +/build/tizen/demo/*.vcxproj
  59 +/build/tizen/demo/*.vcxproj.filters
  60 +/build/tizen/examples/Debug/*
  61 +/build/tizen/examples/Release/*
  62 +/build/tizen/examples/*.dir
  63 +/build/tizen/examples/*.vcxproj
  64 +/build/tizen/examples/*.vcxproj.filters
  65 +/build/tizen/examples-reel/Debug/*
  66 +/build/tizen/examples-reel/Release/*
  67 +/build/tizen/examples-reel/*.dir
  68 +/build/tizen/examples-reel/*.vcxproj
  69 +/build/tizen/examples-reel/*.vcxproj.filters
  70 +/build/tizen/tests-reel/Debug/*
  71 +/build/tizen/tests-reel/Release/*
  72 +/build/tizen/tests-reel/*.dir
  73 +/build/tizen/tests-reel/*.vcxproj
  74 +/build/tizen/tests-reel/*.vcxproj.filters
  75 +
... ...
README.md
  View file @6af0f8f
... ... @@ -11,6 +11,10 @@
11 11 * [NON-SMACK Targets](#non-smack-targets)
12 12 * [SMACK enabled Targets](#smack-enabled-targets)
13 13 * [DEBUG Builds](#debug-builds-1)
  14 + * [3. Building for Android](#3-android-builds)
  15 + * [4. Building for MS Windows](#4-windows-builds)
  16 + * Build with the Visual Studio project.
  17 + * Build with CMake.
14 18 * [Creating an example](#creating-an-example)
15 19  
16 20 # Build Instructions
... ... @@ -112,4 +116,56 @@ To install apks:
112 116 $ adb install -r ./app/build/outputs/apk/debug/dali-demo-debug.apk
113 117 $ adb install -r ./app/build/outputs/apk/release/dali-demo-release.apk
114 118  
  119 +## 4. Building for MS Windows
115 120  
  121 +Third party dependencies are built using vcpkg. Instructions on how to install vcpkg can be found in the
  122 +vcpkg-script folder in the windows-dependencies repository.
  123 +
  124 +- Download the windows-dependencies repository from DaliHub
  125 +
  126 + $ git clone https://github.com/dalihub/windows-dependencies.git
  127 +
  128 +- Read the windows-dependencies/vcpkg-script/Readme.md file for more instructions on how to build and install the third-party dependencies.
  129 +
  130 +### Build with the Visual Studio project
  131 + Read the windows-dependencies/README.md file for more instructions on how to build and run DALi for MS Windows.
  132 +
  133 +### Build with CMake
  134 +
  135 + * Requirements
  136 + It's required the version 3.12.2 of CMake and a Git Bash Shell.
  137 +
  138 + * Notes and troubleshoting:
  139 + It should be possible to use the MS Visual studio Developer Command Prompt (https://docs.microsoft.com/en-us/dotnet/framework/tools/developer-command-prompt-for-vs) to build DALi from the command line.
  140 + However, the CMake version installed with MS Visual Studio 2017 is a bit out of date and some VCPKG modules require a higher version.
  141 + This instructions have been tested with CMake 3.12.2 on a Git Bash shell.
  142 +
  143 + * Define an environment variable to set the path to the VCPKG folder
  144 +
  145 + $ export VCPKG_FOLDER=C:/Users/username/Workspace/VCPKG_TOOL
  146 +
  147 + * Define an environment variable to set the path where DALi is going to be installed.
  148 +
  149 + $ export DALI_ENV_FOLDER=C:/Users/username/Workspace/dali-env
  150 +
  151 + * Execute the following commands to create the makefiles, build and install DALi.
  152 +
  153 + $ cmake -g Ninja . -DCMAKE_TOOLCHAIN_FILE=$VCPKG_FOLDER/vcpkg/scripts/buildsystems/vcpkg.cmake -DENABLE_PKG_CONFIGURE=OFF -DINTERNATIONALIZATION=OFF -DCMAKE_INSTALL_PREFIX=$DALI_ENV_FOLDER
  154 + $ cmake --build . --target install
  155 +
  156 + * Options:
  157 + - CMAKE_TOOLCHAIN_FILE ---> Needed to find packages installed by VCPKG.
  158 + - ENABLE_PKG_CONFIGURE ---> Whether to install pkg configure files (not currently working on MS Windows. CMake modules used instead).
  159 + - INTERNATIONALIZATION ---> Whether to generate and install internazionalization '.po' Portable Object files.
  160 + - CMAKE_INSTALL_PREFIX ---> Were DALi is installed.
  161 + - ENABLE_DEBUG ---> Whether to build with debug enabled.
  162 +
  163 + * If dali-toolkit has been compiled with the USE_DEFAULT_RESOURCE_DIR option disabled then is needed to set global environment variables in order to find the default toolkit resources.
  164 +
  165 + i.e
  166 + $ setx DALI_ENV_FOLDER C:/Users/username/dali-env
  167 + $ setx DALI_IMAGE_DIR $DALI_ENV_FOLDER/share/dali/toolkit/images/
  168 + $ setx DALI_SOUND_DIR $DALI_ENV_FOLDER/share/dali/toolkit/sounds/
  169 + $ setx DALI_STYLE_DIR $DALI_ENV_FOLDER/share/dali/toolkit/styles/
  170 + $ setx DALI_STYLE_IMAGE_DIR $DALI_ENV_FOLDER/share/dali/toolkit/styles/images/
  171 + $ setx DALI_DATA_READ_ONLY_DIR $DALI_ENV_FOLDER/share/dali/
... ...
build/tizen/CMakeLists.txt
  View file @6af0f8f
... ... @@ -11,8 +11,14 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL &quot;GNU&quot;)
11 11 endif()
12 12 endif()
13 13  
14   -SET(ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..)
15   -SET(DEMO_SHARED ${CMAKE_CURRENT_SOURCE_DIR}/../../shared)
  14 +# Define options to CMake
  15 +OPTION(ENABLE_EXPORTALL "Enable Export all symbols" OFF)
  16 +OPTION(ENABLE_DEBUG "Enable Debug" OFF)
  17 +OPTION(ENABLE_PKG_CONFIGURE "Use pkgconfig" ON)
  18 +OPTION(INTERNATIONALIZATION "Internationalization demo string names" ON)
  19 +
  20 +SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
  21 +SET(DEMO_SHARED ${CMAKE_SOURCE_DIR}/../../shared)
16 22  
17 23 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
18 24  
... ... @@ -29,9 +35,16 @@ ELSE()
29 35 ENDIF()
30 36  
31 37 MESSAGE( STATUS "CMAKE_BUILD_TYPE: " ${CMAKE_BUILD_TYPE} )
32   -if(CMAKE_BUILD_TYPE MATCHES Debug)
33   - MESSAGE("Setting variable: DEBUG_ENABLED")
34   - SET(DEBUG_ENABLED "1")
  38 +
  39 +IF(CMAKE_BUILD_TYPE MATCHES Debug)
  40 + SET( ENABLE_DEBUG ON )
  41 +ENDIF()
  42 +
  43 +IF( ENABLE_DEBUG )
  44 + MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Debug )
  45 + SET( ENABLE_EXPORTALL ON )
  46 +ELSE()
  47 + MESSAGE( STATUS "CMAKE_BUILD_TYPE: " Release )
35 48 ENDIF()
36 49  
37 50 SET(RESOURCE_DIR ${ROOT_SRC_DIR}/resources)
... ... @@ -70,7 +83,7 @@ IF(DEFINED DALI_DEMO_RES_DIR)
70 83 SET(DEMO_SHADER_DIR \\"${DALI_DEMO_RES_DIR}/shaders/\\")
71 84 SET(DEMO_STYLE_DIR \\"${DALI_DEMO_RES_DIR}/style/\\")
72 85 SET(DEMO_THEME_PATH \\"${DALI_DEMO_RES_DIR}/style/demo-theme.json\\")
73   - SET(DEMO_LOCALE_DIR \\"${DALI_DEMO_RES_DIR}/locale\")
  86 + SET(DEMO_LOCALE_DIR \\"${DALI_DEMO_RES_DIR}/locale/\")
74 87 SET(DEMO_STYLE_IMAGE_DIR \\"${DALI_DEMO_RES_DIR}/style/images\\")
75 88 ELSE()
76 89 SET(DEMO_GAME_DIR \\"${GAME_DIR}\\")
... ... @@ -152,35 +165,115 @@ FOREACH(flag ${LOCAL_STYLE_IMAGES_LIST})
152 165 ENDFOREACH(flag)
153 166 MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/images")
154 167  
155   -SET(PKG_LIST dali-core
156   - dali-adaptor
157   - dali-toolkit)
  168 +IF( ENABLE_PKG_CONFIGURE )
  169 + SET(PKG_LIST dali-core
  170 + dali-adaptor
  171 + dali-toolkit)
158 172  
159   -INCLUDE(FindPkgConfig)
160   -pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST})
  173 + INCLUDE(FindPkgConfig)
  174 + pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST})
161 175  
162   -FOREACH(flag ${REQUIRED_PKGS_CFLAGS})
  176 + FOREACH(flag ${REQUIRED_PKGS_CFLAGS})
163 177 SET(REQUIRED_CFLAGS "${REQUIRED_CFLAGS} ${flag}")
164   -ENDFOREACH(flag)
  178 + ENDFOREACH(flag)
  179 +ENDIF()
165 180  
166   -SET(DALI_DEMO_CFLAGS "-DDEMO_GAME_DIR=${DEMO_GAME_DIR} -DDEMO_IMAGE_DIR=${DEMO_IMAGE_DIR} -DDEMO_VIDEO_DIR=${DEMO_VIDEO_DIR} -DDEMO_MODEL_DIR=${DEMO_MODEL_DIR} -DDEMO_SCRIPT_DIR=${DEMO_SCRIPT_DIR} -DDEMO_SHADER_DIR=${DEMO_SHADER_DIR} -DDEMO_STYLE_DIR=${DEMO_STYLE_DIR} -DDEMO_THEME_PATH=${DEMO_THEME_PATH} -DDEMO_EXAMPLE_BIN=${DEMO_EXAMPLE_BIN} -DDEMO_LOCALE_DIR=${DEMO_LOCALE_DIR} -fvisibility=hidden -DHIDE_DALI_INTERNALS -DDEMO_LANG=${DEMO_LANG}")
  181 +SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
  182 +
  183 +IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
  184 + FIND_PACKAGE( pthreads REQUIRED )
  185 + FIND_PACKAGE( curl REQUIRED )
  186 + FIND_LIBRARY( GETOPT_LIBRARY NAMES getopt )
  187 + FIND_LIBRARY( EXIF_LIBRARY NAMES libexif )
  188 +
  189 + FIND_PACKAGE( png REQUIRED )
  190 + FIND_PACKAGE( gif REQUIRED )
  191 + FIND_PACKAGE( jpeg REQUIRED )
  192 + FIND_LIBRARY( TURBO_JPEG_LIBRARY NAMES turbojpeg )
  193 +
  194 + FIND_PACKAGE( unofficial-fontconfig REQUIRED )
  195 + FIND_PACKAGE( freetype REQUIRED )
  196 + FIND_PACKAGE( harfbuzz REQUIRED )
  197 + FIND_LIBRARY( FRIBIDI_LIBRARY NAMES fribidi )
  198 +
  199 + FIND_PACKAGE( unofficial-angle REQUIRED )
  200 + FIND_PACKAGE( unofficial-cairo REQUIRED )
  201 +
  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 )
  206 +
  207 + # Set up the include dir
  208 + SET( INCLUDE_DIR $ENV{includedir} )
  209 + IF( NOT INCLUDE_DIR )
  210 + SET( INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} )
  211 + ENDIF()
  212 + IF( NOT INCLUDE_DIR )
  213 + SET( INCLUDE_DIR ${PREFIX}/include )
  214 + ENDIF()
  215 +
  216 + SET( LIB_DIR $ENV{libdir} )
  217 + IF( NOT LIB_DIR )
  218 + SET( LIB_DIR ${CMAKE_INSTALL_LIBDIR} )
  219 + ENDIF()
  220 + IF( NOT LIB_DIR )
  221 + SET( LIB_DIR ${PREFIX}/lib )
  222 + ENDIF()
  223 +
  224 + SET( REQUIRED_LIBS
  225 + PThreads4W::PThreads4W
  226 + CURL::libcurl
  227 + ${GETOPT_LIBRARY}
  228 + ${EXIF_LIBRARY}
  229 + ${PNG_LIBRARIES}
  230 + ${GIF_LIBRARIES}
  231 + JPEG::JPEG
  232 + ${TURBO_JPEG_LIBRARY}
  233 + unofficial::fontconfig::fontconfig
  234 + Freetype::Freetype
  235 + harfbuzz::harfbuzz
  236 + ${FRIBIDI_LIBRARY}
  237 + unofficial::angle::libEGL
  238 + unofficial::angle::libGLESv2
  239 + unofficial::cairo::cairo
  240 + dali-windows-dependencies::dali-windows-dependencies
  241 + dali-core::dali-core
  242 + dali-adaptor::dali-adaptor
  243 + dali-toolkit::dali-toolkit
  244 + )
  245 +ELSEIF( UNIX )
  246 + SET( REQUIRED_LIBS
  247 + ${REQUIRED_PKGS_LDFLAGS}
  248 + -pie
  249 + )
  250 +ENDIF()
167 251  
168   -IF(DEFINED DEBUG_ENABLED)
  252 +SET(DALI_DEMO_CFLAGS "-DDEMO_GAME_DIR=${DEMO_GAME_DIR} -DDEMO_IMAGE_DIR=${DEMO_IMAGE_DIR} -DDEMO_VIDEO_DIR=${DEMO_VIDEO_DIR} -DDEMO_MODEL_DIR=${DEMO_MODEL_DIR} -DDEMO_SCRIPT_DIR=${DEMO_SCRIPT_DIR} -DDEMO_SHADER_DIR=${DEMO_SHADER_DIR} -DDEMO_STYLE_DIR=${DEMO_STYLE_DIR} -DDEMO_THEME_PATH=${DEMO_THEME_PATH} -DDEMO_EXAMPLE_BIN=${DEMO_EXAMPLE_BIN} -DDEMO_LOCALE_DIR=${DEMO_LOCALE_DIR} -DDEMO_LANG=${DEMO_LANG}")
  253 +
  254 +IF( ENABLE_DEBUG )
169 255 SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DDEBUG_ENABLED")
170 256 ENDIF()
171 257  
  258 +IF( UNIX )
  259 + IF( NOT ${ENABLE_EXPORTALL} )
  260 + ADD_DEFINITIONS( "-DHIDE_DALI_INTERNALS" )
  261 + ENDIF()
  262 +ENDIF()
  263 +
172 264 ###########################################################################
173 265 # Internationalization
174 266  
175   -SET(PO_DIR ${RESOURCE_DIR}/po)
  267 +IF (UNIX)
  268 + SET(PO_DIR ${RESOURCE_DIR}/po)
176 269  
177   -FILE(GLOB PO_FILES RELATIVE "${PO_DIR}" "${PO_DIR}/*.po")
  270 + FILE(GLOB PO_FILES RELATIVE "${PO_DIR}" "${PO_DIR}/*.po")
178 271  
179   -SET(MSGFMT "/usr/bin/msgfmt")
180   -SET(MO_FILES_DIR ${CMAKE_CURRENT_BINARY_DIR}/mo)
181   -FILE(MAKE_DIRECTORY ${MO_FILES_DIR})
  272 + SET(MSGFMT "/usr/bin/msgfmt")
  273 + SET(MO_FILES_DIR ${CMAKE_BINARY_DIR}/mo)
  274 + FILE(MAKE_DIRECTORY ${MO_FILES_DIR})
182 275  
183   -FOREACH(PO_FILE ${PO_FILES})
  276 + FOREACH(PO_FILE ${PO_FILES})
184 277 SET(PO_FILE ${PO_DIR}/${PO_FILE})
185 278 MESSAGE("PO: ${PO_FILE}")
186 279 GET_FILENAME_COMPONENT(ABS_PO_FILE ${PO_FILE} ABSOLUTE)
... ... @@ -191,22 +284,40 @@ FOREACH(PO_FILE ${PO_FILES})
191 284 DEPENDS ${ABS_PO_FILE})
192 285 INSTALL(FILES ${MO_FILE} DESTINATION ${LOCALE_DIR}/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo)
193 286 SET(MO_FILES ${MO_FILES} ${MO_FILE})
194   -ENDFOREACH(PO_FILE)
  287 + ENDFOREACH(PO_FILE)
195 288  
196   -MESSAGE(".mo files: ${MO_FILES}")
197   -ADD_CUSTOM_TARGET(po ALL DEPENDS ${MO_FILES})
  289 + MESSAGE(".mo files: ${MO_FILES}")
  290 + ADD_CUSTOM_TARGET(po ALL DEPENDS ${MO_FILES})
  291 +ENDIF()
198 292  
199   -OPTION(INTERNATIONALIZATION "Internationalization demo string names" ON)
200 293 IF (INTERNATIONALIZATION)
201   - SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DINTERNATIONALIZATION_ENABLED")
  294 + SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -DINTERNATIONALIZATION_ENABLED")
202 295 ENDIF(INTERNATIONALIZATION)
203 296  
204 297 ###########################################################################
205 298  
206   -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE")
  299 +IF( WIN32 )
  300 + ADD_COMPILE_OPTIONS( /FIdali-windows-dependencies.h ) # Adds missing definitions.
  301 + ADD_COMPILE_OPTIONS( /vmg ) # Avoids a 'reinterpret_cast' compile error while compiling signals and callbacks.
  302 + ADD_COMPILE_OPTIONS( /wd4251 ) # Ignores warning C4251: "'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'"
  303 +ELSE()
  304 + SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -Werror -Wall -fPIE")
  305 +
  306 + IF( NOT ${ENABLE_EXPORTALL} )
  307 + SET(DALI_DEMO_CFLAGS "${DALI_DEMO_CFLAGS} -fvisibility=hidden")
  308 + ENDIF()
  309 +ENDIF()
  310 +
  311 +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${REQUIRED_CFLAGS} ${DALI_DEMO_CFLAGS}")
207 312 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_FLAGS}")
208 313  
209   -INCLUDE_DIRECTORIES(${ROOT_SRC_DIR})
  314 +INCLUDE_DIRECTORIES(
  315 + ${SYSTEM_INCLUDE_DIR}
  316 + ${ROOT_SRC_DIR}
  317 + ${VCPKG_INCLUDE_DIR}
  318 + ${INCLUDE_DIR}
  319 +)
  320 +
210 321 IF(ANDROID)
211 322 INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sources/android/native_app_glue )
212 323 INCLUDE_DIRECTORIES( ${ANDROID_NDK}/sysroot/usr )
... ... @@ -214,8 +325,23 @@ IF(ANDROID)
214 325 INCLUDE_DIRECTORIES( ${ROOT_SRC_DIR}/build/android/app/src/main/cpp )
215 326 ENDIF()
216 327  
  328 +LINK_DIRECTORIES(${LIB_DIR})
  329 +
217 330 ADD_SUBDIRECTORY(demo)
218 331 ADD_SUBDIRECTORY(examples)
219 332 ADD_SUBDIRECTORY(examples-reel)
220 333 ADD_SUBDIRECTORY(tests-reel)
221 334 ADD_SUBDIRECTORY(builder)
  335 +
  336 +
  337 +MESSAGE( " Folder DEMO_IMAGE_DIR : [" ${DEMO_IMAGE_DIR} "]" )
  338 +MESSAGE( " Folder DEMO_STYLE_DIR : [" ${DEMO_STYLE_DIR} "]" )
  339 +MESSAGE( " Folder DEMO_SHADER_DIR : [" ${DEMO_SHADER_DIR} "]" )
  340 +MESSAGE( " Folder DEMO_THEME_PATH : [" ${DEMO_THEME_PATH} "]" )
  341 +MESSAGE( " Folder DEMO_GAME_DIR : [" ${DEMO_GAME_DIR} "]" )
  342 +MESSAGE( " Folder DEMO_VIDEO_DIR : [" ${DEMO_VIDEO_DIR} "]" )
  343 +MESSAGE( " Folder DEMO_MODEL_DIR : [" ${DEMO_MODEL_DIR} "]" )
  344 +MESSAGE( " Folder DEMO_SCRIPT_DIR : [" ${DEMO_SCRIPT_DIR} "]" )
  345 +MESSAGE( " Folder DEMO_LOCALE_DIR : [" ${DEMO_LOCALE_DIR} "]" )
  346 +MESSAGE( " Folder DEMO_EXAMPLE_BIN : [" ${DEMO_EXAMPLE_BIN} "]" )
  347 +MESSAGE( " Folder DEMO_LANG : [" ${DEMO_LANG} "]" )
... ...
build/tizen/builder/CMakeLists.txt
  View file @6af0f8f
... ... @@ -7,5 +7,7 @@ IF(SHARED)
7 7 ELSE()
8 8 ADD_EXECUTABLE(dali-builder ${DALI_BUILDER_SRCS})
9 9 ENDIF()
10   -TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_PKGS_LDFLAGS} -pie)
  10 +
  11 +TARGET_LINK_LIBRARIES(dali-builder ${REQUIRED_LIBS})
  12 +
11 13 INSTALL(TARGETS dali-builder DESTINATION ${BINDIR})
... ...
build/tizen/demo/CMakeLists.txt
  View file @6af0f8f
... ... @@ -8,7 +8,12 @@ SET(DEMO_SRCS
8 8 "${ROOT_SRC_DIR}/shared/dali-table-view.cpp"
9 9 )
10 10  
11   -IF(ANDROID)
  11 +IF(WIN32)
  12 + SET(DEMO_SRCS
  13 + ${DEMO_SRCS}
  14 + "${ROOT_SRC_DIR}/shared/execute-process-win.cpp"
  15 + )
  16 +ELSEIF(ANDROID)
12 17 SET(DEMO_SRCS
13 18 ${DEMO_SRCS}
14 19 "${ROOT_SRC_DIR}/shared/execute-process-android.cpp"
... ... @@ -26,7 +31,7 @@ ELSE()
26 31 ADD_EXECUTABLE(${PROJECT_NAME} ${DEMO_SRCS})
27 32 ENDIF()
28 33  
29   -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_PKGS_LDFLAGS} -pie)
  34 +TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${REQUIRED_LIBS})
30 35  
31 36 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
32 37  
... ...
build/tizen/examples-reel/CMakeLists.txt
  View file @6af0f8f
... ... @@ -8,7 +8,12 @@ SET(EXAMPLES_REEL_SRCS
8 8 "${ROOT_SRC_DIR}/shared/dali-table-view.cpp"
9 9 )
10 10  
11   -IF(ANDROID)
  11 +IF(WIN32)
  12 + SET(EXAMPLES_REEL_SRCS
  13 + ${EXAMPLES_REEL_SRCS}
  14 + "${ROOT_SRC_DIR}/shared/execute-process-win.cpp"
  15 + )
  16 +ELSEIF(ANDROID)
12 17 SET(EXAMPLES_REEL_SRCS
13 18 ${EXAMPLES_REEL_SRCS}
14 19 "${ROOT_SRC_DIR}/shared/execute-process-android.cpp"
... ... @@ -26,7 +31,7 @@ ELSE()
26 31 ADD_EXECUTABLE(dali-examples ${EXAMPLES_REEL_SRCS})
27 32 ENDIF()
28 33  
29   -TARGET_LINK_LIBRARIES(dali-examples ${REQUIRED_PKGS_LDFLAGS} -pie)
  34 +TARGET_LINK_LIBRARIES(dali-examples ${REQUIRED_LIBS})
30 35  
31 36 INSTALL(TARGETS dali-examples DESTINATION ${BINDIR})
32 37  
... ...
build/tizen/examples/CMakeLists.txt
  View file @6af0f8f
... ... @@ -21,6 +21,6 @@ FOREACH(EXAMPLE ${SUBDIRS})
21 21 ELSE()
22 22 ADD_EXECUTABLE(${EXAMPLE}.example ${SRCS})
23 23 ENDIF()
24   - TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_PKGS_LDFLAGS} -pie)
  24 + TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_LIBS})
25 25 INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})
26 26 ENDFOREACH(EXAMPLE)
... ...
build/tizen/tests-reel/CMakeLists.txt
  View file @6af0f8f
... ... @@ -8,7 +8,12 @@ SET(TESTS_REEL_SRCS
8 8 "${ROOT_SRC_DIR}/shared/dali-table-view.cpp"
9 9 )
10 10  
11   -IF(ANDROID)
  11 +IF(WIN32)
  12 + SET(TESTS_REEL_SRCS
  13 + ${TESTS_REEL_SRCS}
  14 + "${ROOT_SRC_DIR}/shared/execute-process-win.cpp"
  15 + )
  16 +ELSEIF(ANDROID)
12 17 SET(TESTS_REEL_SRCS
13 18 ${TESTS_REEL_SRCS}
14 19 "${ROOT_SRC_DIR}/shared/execute-process-android.cpp"
... ... @@ -25,7 +30,8 @@ IF(SHARED)
25 30 ELSE()
26 31 ADD_EXECUTABLE(dali-tests ${TESTS_REEL_SRCS})
27 32 ENDIF()
28   -TARGET_LINK_LIBRARIES(dali-tests ${REQUIRED_PKGS_LDFLAGS} -pie)
  33 +
  34 +TARGET_LINK_LIBRARIES(dali-tests ${REQUIRED_LIBS})
29 35  
30 36 INSTALL(TARGETS dali-tests DESTINATION ${BINDIR})
31 37  
... ...