Merge lp:~midori/midori/cmakeWin32fixes into lp:midori

[Cris Dywan]

Adjust cmake build for Win32

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-01 17:10:49 +0000
+++ CMakeLists.txt	2013-09-01 21:28:57 +0000
@@ -34,9 +34,12 @@
 if (UNISTD)
     add_definitions("-DHAVE_UNISTD_H")
 endif ()
-find_file (SIGNAL signal.h)
-if (SIGNAL)
-    add_definitions("-DHAVE_SIGNAL_H")
+
+if (UNIX)
+    find_file (SIGNAL signal.h)
+    if (SIGNAL)
+        add_definitions("-DHAVE_SIGNAL_H")
+    endif ()
 endif ()
 
 find_library (X11 X11)
@@ -175,6 +178,10 @@
 set(CFLAGS "-w -Wno-deprecated-declarations")
 set(LIBMIDORI "${CMAKE_PROJECT_NAME}-core")
 
+# CMake provides no uninstall target by design
+add_custom_target (uninstall
+    COMMAND "xargs" "rm" "-v" "<" "install_manifest.txt")
+
 add_subdirectory (midori)
 add_subdirectory (po)
 add_subdirectory (icons)
 
=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-08-22 22:53:09 +0000
+++ data/CMakeLists.txt	2013-09-01 21:28:57 +0000
@@ -15,7 +15,7 @@
     string(FIND ${FILE} "midori." MIDORI_FILE)
     string(FIND ${FILE} ".desktop" DESKTOP_FILE)
     if (FAQ_FILE GREATER -1)
-    elseif (DESKTOP_FILE GREATER -1)
+    elseif (DESKTOP_FILE GREATER -1 AND NOT WIN32)
         string(SUBSTRING ${FILE} 0 ${DESKTOP_FILE} DESKTOP_ID)
         INTLTOOL_MERGE_DESKTOP (${DESKTOP_ID} po)
     elseif(MIDORI_FILE GREATER -1)
 
=== modified file 'midori/CMakeLists.txt'
--- midori/CMakeLists.txt	2013-08-19 20:15:19 +0000
+++ midori/CMakeLists.txt	2013-09-01 21:28:57 +0000
@@ -49,11 +49,23 @@
                       SOVERSION 1
                       VERSION 0.0.0
                       )
-install(TARGETS ${LIBMIDORI}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        )
-
-add_executable(${CMAKE_PROJECT_NAME} main.c)
+if (WIN32)
+    install(TARGETS ${LIBMIDORI}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            )
+else ()
+    install(TARGETS ${LIBMIDORI}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            )
+endif ()
+
+if (WIN32)
+    add_executable(${CMAKE_PROJECT_NAME} WIN32 main.c "${CMAKE_SOURCE_DIR}/data/midori.rc")
+else()
+    add_executable(${CMAKE_PROJECT_NAME} main.c)
+endif()
+
 target_link_libraries(${CMAKE_PROJECT_NAME}
                       ${LIBMIDORI})
 set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES