@@ -219,7 +219,7 @@ namespace Avogadro QMap<Engine*, QWidget*> engineSettingsWindows; }; - const int MainWindow::m_configFileVersion = 2; + const int MainWindow::m_configFileVersion = 3; unsigned int getMainWindowCount() { avogadro/src/mainwindow.cpp @@ -22,8 +22,13 @@ include_directories( link_directories(${OPENBABEL2_LIBRARY_DIRS}) # Library translations -file(GLOB_RECURSE libavogadro_PO "${Avogadro_SOURCE_DIR}/i18n/libavogadro*.po") -QT4_WRAP_PO(libavogadro_QM ${libavogadro_PO}) +if(NOT WIN32) + file(GLOB_RECURSE libavogadro_PO "${Avogadro_SOURCE_DIR}/i18n/libavogadro*.po") + QT4_WRAP_PO(libavogadro_QM ${libavogadro_PO}) +else(NOT WIN32) + # don't attempt to create QM files on windows -- copy them from a linux build! + file(GLOB_RECURSE libavogadro_QM "${Avogadro_SOURCE_DIR}/libavogadro/src/libavogadro*.qm") +endif(NOT WIN32) file(GLOB libavogadro_SRCS "*.cpp") libavogadro/src/CMakeLists.txt @@ -167,6 +167,6 @@ namespace Avogadro { Q_DECLARE_METATYPE(Avogadro::Plugin*) Q_DECLARE_INTERFACE(Avogadro::PluginFactory, - "net.sourceforge.avogadro.pluginfactory/1.3") + "net.sourceforge.avogadro.pluginfactory/1.4") #endif libavogadro/src/plugin.h 01fa8669024877b45cc0ad9ca84ae0da4780e33c 5e465b0414d2c35337769288763544b3344ba9bc Geoff Hutchison babel@geoffhutchison.net http://github.com/dlonie/avogadro/commit/cdd25d9d65982d4507a0ccd51d766c926b504a95 cdd25d9d65982d4507a0ccd51d766c926b504a95 2009-10-18T11:07:03-07:00 2009-10-18T11:07:03-07:00 Merge branch 'master' of git@github.com:cryos/avogadro 3f8fcef1d800596864233b4def2a207ac5eaed2a Geoff Hutchison babel@geoffhutchison.net