commit 8cec88e6bcd1fe515474e3a561f5f41edc26863a
Author: Maia Kozheva <si...@ubuntu.com>
Date: Thu Aug 26 15:50:13 2010 +0700
CMake fixes from Ubuntu
CMakeLists.txt | 8 ++++----
cmake/install.cmake | 9 +++++----
cmake/sources.cmake | 2 --
3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9731b1..2f6f70a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 2.6)
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
set(PACKAGE ${CMAKE_PROJECT_NAME})
-set(VERSION 0.99.17GIT)
+set(VERSION 1.0.0)
set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
set(PACKAGE_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share)
set(PACKAGE_LOCALE_DIR ${PACKAGE_DATA_DIR}/locale)
@@ -98,7 +98,7 @@ if(WANT_FLAC)
endif()
if(LINK_AS_NEEDED)
- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
endif()
check_include_file(inttypes.h HAVE_INTTYPES_H)
@@ -137,6 +137,8 @@ add_custom_target(desktopfile ALL
${INTLTOOL_MERGE_EXECUTABLE} -d
${CMAKE_BINARY_DIR}/gtkpod.desktop)
include(sources)
+include(Po)
+compile_po_files(po GTKPOD_SOURCES)
add_executable(gtkpod ${GTKPOD_SOURCES})
target_link_libraries(gtkpod
@@ -148,6 +150,4 @@ target_link_libraries(gtkpod
${OPT_LIBS}
)
-include(Po)
-compile_po_files(po GTKPOD_LOCALES)
include(install)
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 10d31ce..928ad11 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -12,17 +12,18 @@ install(FILES
data/gtkpod-logo.png
data/gtkpod-read-16.png
data/gtkpod-read.png
- data/gtkpod-sync.png
data/photo-toolbar-album.png
data/photo-toolbar-photos.png
data/gtkpod.glade
DESTINATION ${DATA_INSTALL_DEST}/data)
-install(DIRECTORY data/ui DESTINATION ${DATA_INSTALL_DEST}/data)
-install(DIRECTORY doc scripts DESTINATION ${DATA_INSTALL_DEST})
+install(DIRECTORY doc DESTINATION ${DATA_INSTALL_DEST} PATTERN "Makefile.*"
EXCLUDE)
+install(DIRECTORY scripts DESTINATION ${DATA_INSTALL_DEST}
+ FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ PATTERN "Makefile.*" EXCLUDE)
install(FILES ${CMAKE_BINARY_DIR}/gtkpod.1 DESTINATION
${PACKAGE_DATA_DIR}/man/man1)
install(FILES ${CMAKE_BINARY_DIR}/gtkpod.desktop DESTINATION
${PACKAGE_DATA_DIR}/applications)
-install(DIRECTORY data/icons/hicolor DESTINATION ${DATA_INSTALL_DEST}/icons)
+install(DIRECTORY data/icons/hicolor DESTINATION ${DATA_INSTALL_DEST}/icons
PATTERN "Makefile.*" EXCLUDE)
install(FILES data/icons/16x16/gtkpod.png DESTINATION
${PACKAGE_DATA_DIR}/icons/hicolor/16x16/apps)
install(FILES data/icons/22x22/gtkpod.png DESTINATION
${PACKAGE_DATA_DIR}/icons/hicolor/22x22/apps)
diff --git a/cmake/sources.cmake b/cmake/sources.cmake
index 48d1c33..de91314 100644
--- a/cmake/sources.cmake
+++ b/cmake/sources.cmake
@@ -27,7 +27,6 @@ set(GTKPOD_SOURCES
src/infodlg.c
src/ipod_init.c
src/main.c
- src/md5.c
src/misc.c
src/misc_confirm.c
src/misc_conversion.c
@@ -46,7 +45,6 @@ set(GTKPOD_SOURCES
src/sha1.c
src/sort_window.c
src/stock_icons.c
- src/support.c
src/syncdir.c
src/tools.c
src/wavfile.c
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
