From f94e3ab6047ee725c11a6154ff10892811e9226c Mon Sep 17 00:00:00 2001
From: Hugo Lima <hugo.lima@openbossa.org>
Date: Sat, 21 Nov 2009 15:53:22 -0200
Subject: Add proper compiler flags for msvc.

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93b8374d3..50362f666 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,12 @@ cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 4.5.0 REQUIRED)
 find_package(ApiExtractor REQUIRED)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DGENRUNNER_BUILD -fvisibility=hidden")
+if (MSVC)
+    set(CMAKE_CXX_FLAGS "/DWIN32 /D_WINDOWS /w /EHsc- /GS- /GR- /DGENRUNNER_BUILD -D_SCL_SECURE_NO_WARNINGS")
+else (MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden")
+endif(MSVC)
+
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
 
-- 
cgit v1.2.3


From 0c1ef1849561b56a9f06f0225887b65b0e07beec Mon Sep 17 00:00:00 2001
From: Hugo Lima <hugo.lima@openbossa.org>
Date: Mon, 23 Nov 2009 14:39:36 -0200
Subject: Install FindGenRunner.cmake and libgenrunner in the correct
 directory.

---
 CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50362f666..2c9b8f289 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,14 +67,16 @@ add_custom_target(dist
         | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
-install(TARGETS genrunner DESTINATION ${LIB_INSTALL_DIR})
+install(TARGETS genrunner LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+                          ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+                          RUNTIME DESTINATION bin)
 install(TARGETS generatorrunner DESTINATION bin)
 install(FILES generator.h DESTINATION include/generatorrunner)
 install(FILES generatorrunnermacros.h DESTINATION include/generatorrunner)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/generatorrunner.pc DESTINATION
         ${LIB_INSTALL_DIR}/pkgconfig)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindGeneratorRunner.cmake
-        DESTINATION share/cmake-2.6/Modules)
+        DESTINATION "share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/Modules")
 
 #FIXME: manpages should be installed only on Linux targets
 file(GLOB manpages ${CMAKE_CURRENT_SOURCE_DIR}/*.1)
-- 
cgit v1.2.3