diff options
| author | Junfeng Dong <junfeng.dong@intel.com> | 2013-01-31 17:59:39 +0800 |
|---|---|---|
| committer | lifang <fangx.li@intel.com> | 2013-04-02 23:17:55 +0800 |
| commit | 22ee826a7101502614cafe22946461b7c340d480 (patch) | |
| tree | 9c38481f1ff86cb962b74e87577e6e572fe3d819 | |
| parent | 48ae674d904cc04685c24700e393e4a2c733fcd8 (diff) | |
| download | syspopup-22ee826a7101502614cafe22946461b7c340d480.tar.gz syspopup-22ee826a7101502614cafe22946461b7c340d480.tar.bz2 syspopup-22ee826a7101502614cafe22946461b7c340d480.zip | |
Fixed build on x86_64.
Change-Id: I4f54765718ce507f526271a5806042866b94919d
| -rwxr-xr-x | packaging/syspopup.spec | 6 | ||||
| -rw-r--r-- | syspopup-caller/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | syspopup/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/packaging/syspopup.spec b/packaging/syspopup.spec index 24de966..4b7f957 100755 --- a/packaging/syspopup.spec +++ b/packaging/syspopup.spec @@ -49,15 +49,14 @@ syspopup-caller development package for popup %prep -%setup -q -n %{name}-%{version} +%setup -q %build -CFLAGS=${_cflags} cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DEXTRA_CFLAGS=-fPIC +%cmake . -DEXTRA_CFLAGS=-fPIC make %{?jobs:-j%jobs} %install -rm -rf %{buildroot} %make_install mkdir -p %{buildroot}/opt/dbspace @@ -105,4 +104,3 @@ touch %{buildroot}%{_datadir}/popup_noti_term %{_libdir}/libsyspopup_caller.so %{_includedir}/syspopup_caller.h %{_libdir}/pkgconfig/syspopup-caller.pc - diff --git a/syspopup-caller/CMakeLists.txt b/syspopup-caller/CMakeLists.txt index 47ffb1d..2fcc6ce 100644 --- a/syspopup-caller/CMakeLists.txt +++ b/syspopup-caller/CMakeLists.txt @@ -61,7 +61,7 @@ SET_TARGET_PROPERTIES(syspopup_caller PROPERTIES SOVERSION 0.1.0) CONFIGURE_FILE(syspopup-caller.pc.in ${CMAKE_CURRENT_BINARY_DIR}/syspopup-caller.pc @ONLY) ### Install ### -INSTALL(TARGETS syspopup_caller DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS syspopup_caller DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/syspopup_caller.h DESTINATION include) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/syspopup-caller.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/syspopup-caller.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/syspopup/CMakeLists.txt b/syspopup/CMakeLists.txt index f7862be..f9caa16 100644 --- a/syspopup/CMakeLists.txt +++ b/syspopup/CMakeLists.txt @@ -61,7 +61,7 @@ SET_TARGET_PROPERTIES(syspopup PROPERTIES SOVERSION 0.1.0) CONFIGURE_FILE(syspopup.pc.in ${CMAKE_CURRENT_BINARY_DIR}/syspopup.pc @ONLY) ### Install ### -INSTALL(TARGETS syspopup DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS syspopup DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../include/syspopup.h DESTINATION include) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/syspopup.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/syspopup.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) |