diff options
| author | Vikas Kumar Agrawal <vikas.ag@samsung.com> | 2018-04-03 10:47:04 +0530 |
|---|---|---|
| committer | Vikas Kumar Agrawal <vikas.ag@samsung.com> | 2018-04-03 10:56:04 +0530 |
| commit | f3ac7ad4a5b34f1c184f03fe3ab558f9bb75a4dc (patch) | |
| tree | 5f700ae7f663941774ea2305e9fd673973e68af7 | |
| parent | 62483d609acac32754114608bb1b3225db2b6599 (diff) | |
| parent | 7faf2743f6bcea8ef7be6ac5ed64b085623f69a1 (diff) | |
| download | attach-panel-document-f3ac7ad4a5b34f1c184f03fe3ab558f9bb75a4dc.tar.gz attach-panel-document-f3ac7ad4a5b34f1c184f03fe3ab558f9bb75a4dc.tar.bz2 attach-panel-document-f3ac7ad4a5b34f1c184f03fe3ab558f9bb75a4dc.zip | |
Merge branch 'sandbox/dnxowls/cmake_upgrade' into tizensubmit/tizen/20180408.231339submit/tizen/20180408.214102submit/tizen/20180402.232840accepted/tizen/unified/20180409.100014
Change-Id: I521630d95831cf92e76245dc5a622f495fa96582
| -rwxr-xr-x | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | packaging/org.tizen.attach-panel-document.spec | 12 | ||||
| -rwxr-xr-x | src/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a6db6ba..cdf217f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,10 +9,10 @@ ADD_DEFINITIONS("-D_USE_SECURE_LOG_") # subdir ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(res/edje) -ADD_SUBDIRECTORY(res/edje/icons) +#ADD_SUBDIRECTORY(res/edje) +#ADD_SUBDIRECTORY(res/edje/icons) ADD_SUBDIRECTORY(res/po) -ADD_SUBDIRECTORY(res/edje/sounds) +#ADD_SUBDIRECTORY(res/edje/sounds) CONFIGURE_FILE(attach-panel-document.manifest ${PKGNAME}.manifest) diff --git a/packaging/org.tizen.attach-panel-document.spec b/packaging/org.tizen.attach-panel-document.spec index 77af74e..2330014 100644 --- a/packaging/org.tizen.attach-panel-document.spec +++ b/packaging/org.tizen.attach-panel-document.spec @@ -43,17 +43,9 @@ export FFLAGS="$FFLAGS -DTIZEN_ENGINEER_MODE" cmake . \ -DPREFIX=%{PREFIX} \ - -DPKGDIR=%{name} \ - -DIMGDIR=%{IMGDIR} \ - -DEDJDIR=%{EDJDIR} \ -DPKGNAME=%{name} \ - -DBINDIR=%{BINDIR} \ - -DMANIFESTDIR=%{MANIFESTDIR} \ - -DEDJIMGDIR=%{EDJIMGDIR} \ -DLIBDIR=%{LIBDIR} \ - -DICONDIR=%{ICONDIR} \ -DLOCALEDIR=%{LOCALEDIR} \ - -DIMGICONDIR=%{IMGICONDIR} \ -DPREFIX1=%{TZ_SYS_RO_UG} \ -DRESDIR=%{RESDIR} @@ -61,9 +53,7 @@ cmake . \ CXXFLAGS+=" -D_ARCH_ARM_ -mfpu=neon" %endif -cmake . -DCMAKE_INSTALL_PREFIX=%{TZ_SYS_RO_UG} \ - -DARCH=%{ARCH} \ - -DTZ_SYS_RO_PACKAGES=%{TZ_SYS_RO_PACKAGES} +cmake . -DCMAKE_INSTALL_PREFIX=%{TZ_SYS_RO_UG} make %{?jobs:-j%jobs} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bfa8c05..464370a 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,7 +40,7 @@ FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}") ENDFOREACH(flag) -SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall") +SET(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} -fvisibility=hidden -Wall -fPIC") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS}") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CXX_FLAGS}") |