Skip to content

Commit 7ba1929

Browse files
committed
Add VC2012 props and update packaging
1 parent 8aa6aa5 commit 7ba1929

File tree

2 files changed

+40
-9
lines changed

2 files changed

+40
-9
lines changed

CMakeLists.txt

+7-9
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ execute_process(COMMAND patch -p0 --binary -i ${CMAKE_CURRENT_SOURCE_DIR}/patche
4545
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${GSTREAMERMM_DIR})
4646
configure_file(patches/gstreamermmconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/${GSTREAMERMM_DIR}/gstreamer/gstreamermmconfig.h @ONLY)
4747

48-
SET(CPACK_PACKAGE_VERSION_MAJOR 3)
49-
SET(CPACK_PACKAGE_VERSION_MINOR 1)
50-
set( CPACK_GENERATOR "ZIP" )
51-
TODAY(TWEAK)
52-
SET(CPACK_PACKAGE_VERSION_PATCH "18-${TWEAK}")
53-
54-
INCLUDE(CPack)
55-
5648
# Use this or uncomment next line for release build "\Program Files\CMake 2.8\bin\cmake.exe" -D CMAKE_BUILD_TYPE=RELEASE ..
5749
#set(CMAKE_BUILD_TYPE RELEASE CACHE STRING "Forced release" FORCE)
5850

@@ -131,9 +123,15 @@ add_subdirectory(${XMLMM_DIR}/libxml++)
131123
add_subdirectory(${GSTREAMERMM_DIR})
132124

133125
configure_file(MSVC/gtkmm3.vsprops.in ${CMAKE_CURRENT_SOURCE_DIR}/MSVC/gtkmm3${POSTFIX}.vsprops @ONLY)
126+
configure_file(MSVC/gtkmm3.props.in ${CMAKE_CURRENT_SOURCE_DIR}/MSVC/gtkmm3${POSTFIX}.props @ONLY)
134127
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/MSVC/gtkmm3${POSTFIX}.vsprops DESTINATION "MSVC")
128+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/MSVC/gtkmm3${POSTFIX}.props DESTINATION "MSVC")
135129
#set(RuntimeLibrary 3) # for debug
136130

137131
configure_file(README.md.in ${CMAKE_CURRENT_SOURCE_DIR}/README.md @ONLY)
138132

139-
install(DIRECTORY ${GlibEtcInstallRoot}/ DESTINATION .)
133+
set( CPACK_GENERATOR "ZIP" )
134+
GET_VERSION(${GTKMM_DIR} CPACK_PACKAGE_VERSION_MAJOR CPACK_PACKAGE_VERSION_MINOR CPACK_PACKAGE_VERSION_PATCH)
135+
SET(CPACK_PACKAGE_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}${POSTFIX}")
136+
137+
INCLUDE(CPack)

MSVC/gtkmm3.props.in

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="Windows-1252"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets">
4+
</ImportGroup>
5+
<PropertyGroup Label="UserMacros">
6+
<GTKMM3_BASEPATH>@CMAKE_INSTALL_PREFIX@</GTKMM3_BASEPATH>
7+
<GlibEtcInstallRoot>@GlibEtcInstallRoot@</GlibEtcInstallRoot>
8+
</PropertyGroup>
9+
<PropertyGroup>
10+
<_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
11+
<_PropertySheetDisplayName>gtkmm @GTKMM_VERSION@ Debug Win32</_PropertySheetDisplayName>
12+
</PropertyGroup>
13+
<ItemDefinitionGroup>
14+
<ClCompile>
15+
<AdditionalOptions>/vd2 %(AdditionalOptions)</AdditionalOptions>
16+
<AdditionalIncludeDirectories>$(GlibEtcInstallRoot)/include;$(GlibEtcInstallRoot)/include/gtk-3.0;$(GlibEtcInstallRoot)/include/glib-2.0;$(GlibEtcInstallRoot)/lib/glib-2.0/include;$(GlibEtcInstallRoot)/include/atk-1.0;$(GlibEtcInstallRoot)/include/pango-1.0;$(GlibEtcInstallRoot)/include/cairo;$(GlibEtcInstallRoot)/include/freetype2;$(GlibEtcInstallRoot)/include/gdk-pixbuf-2.0;$(GTKMM3_BASEPATH)\lib\gtkmm-@GTKMM_VERSION@\include;$(GTKMM3_BASEPATH)\include\gtkmm-@GTKMM_VERSION@;$(GTKMM3_BASEPATH)\lib\gdkmm-@GTKMM_VERSION@\include;$(GTKMM3_BASEPATH)\include\gdkmm-@GTKMM_VERSION@;$(GTKMM3_BASEPATH)\lib\pangomm-@PANGOMM_VERSION@\include;$(GTKMM3_BASEPATH)\include\pangomm-@PANGOMM_VERSION@;$(GTKMM3_BASEPATH)\include\atkmm-@ATKMM_VERSION@;$(GTKMM3_BASEPATH)\lib\giomm-@GLIBMM_VERSION@\include;$(GTKMM3_BASEPATH)\include\giomm-@GLIBMM_VERSION@;$(GTKMM3_BASEPATH)\lib\glibmm-@GLIBMM_VERSION@\include;$(GTKMM3_BASEPATH)\include\glibmm-@GLIBMM_VERSION@;$(GTKMM3_BASEPATH)\include\cairomm-@CAIROMM_VERSION@;$(GTKMM3_BASEPATH)\lib\sigc++-@SIGC_VERSION@\include;$(GTKMM3_BASEPATH)\include\sigc++-@SIGC_VERSION@;$(GTKMM3_BASEPATH)\lib\gtk-@GtkApiVersion@\include;$(GTKMM3_BASEPATH)\include\gtk-@GtkApiVersion@;$(GTKMM3_BASEPATH)\include\gdk-pixbuf-2.0;$(GTKMM3_BASEPATH)\include\pango-1.0;$(GTKMM3_BASEPATH)\include\atk-1.0;$(GTKMM3_BASEPATH)\lib\glib-2.0\include;$(GTKMM3_BASEPATH)\include\glib-2.0;$(GTKMM3_BASEPATH)\include\libxml2;$(GTKMM3_BASEPATH)\include\cairo;$(GTKMM3_BASEPATH)\include\freetype2;$(GTKMM3_BASEPATH)\include;$(GTKMM3_BASEPATH)\include\gstreamermm-@GSTREAMERMM_VERSION@;$(GTKMM3_BASEPATH)\include\libxml++-@XMLMM_VERSION@;$(GTKMM3_BASEPATH)\include\gstreamer-1.0;$(GTKMM3_BASEPATH)\lib\libxml++-@XMLMM_VERSION@\include</AdditionalIncludeDirectories>
17+
<PreprocessorDefinitions>G_HAVE_ISO_VARARGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
18+
<DisableSpecificWarnings>4250;4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
19+
</ClCompile>
20+
<Link>
21+
<AdditionalDependencies>gstreamer-1.0.lib;gstreamermm-@GSTREAMERMM_VERSION@@[email protected];gtkmm-@GTKMM_VERSION@@[email protected];gdkmm-@GTKMM_VERSION@@[email protected];atkmm-@ATKMM_VERSION@@[email protected];pangomm-@PANGOMM_VERSION@@[email protected];giomm-@GLIBMM_VERSION@@[email protected];glibmm-@GLIBMM_VERSION@@[email protected];cairomm-@CAIROMM_VERSION@@[email protected];sigc-@SIGC_VERSION@@[email protected];gtk-3.lib;xml2.lib;gdk-3.lib;atk-1.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;%(AdditionalDependencies)</AdditionalDependencies>
22+
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;$(GTKMM3_BASEPATH)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
23+
</Link>
24+
</ItemDefinitionGroup>
25+
<ItemGroup>
26+
<BuildMacro Include="GTKMM3_BASEPATH">
27+
<Value>$(GTKMM3_BASEPATH)</Value>
28+
</BuildMacro>
29+
<BuildMacro Include="GlibEtcInstallRoot">
30+
<Value>$(GlibEtcInstallRoot)</Value>
31+
</BuildMacro>
32+
</ItemGroup>
33+
</Project>

0 commit comments

Comments
 (0)