Author: kuemmel Date: Tue Jun 1 14:46:35 2010 New Revision: 34574 URL: http://www.lyx.org/trac/changeset/34574
Log: cmake: sync with trunk, should be uncritical Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/configCompiler.h.cmake lyx-devel/branches/BRANCH_1_6_X/development/cmake/lyx2lyx/CMakeLists.txt lyx-devel/branches/BRANCH_1_6_X/development/cmake/pcheaders.h lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/client/CMakeLists.txt lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/frontends/CMakeLists.txt lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/support/CMakeLists.txt lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/tex2lyx/CMakeLists.txt Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/configCompiler.h.cmake ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/development/cmake/configCompiler.h.cmake Tue Jun 1 14:24:21 2010 (r34573) +++ lyx-devel/branches/BRANCH_1_6_X/development/cmake/configCompiler.h.cmake Tue Jun 1 14:46:35 2010 (r34574) @@ -179,6 +179,9 @@ #define HAVE_MODE_T #endif +#cmakedefine _GLIBCXX_DEBUG 1 +#cmakedefine _GLIBCXX_DEBUG_PEDANTIC 1 + #endif Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/lyx2lyx/CMakeLists.txt ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/development/cmake/lyx2lyx/CMakeLists.txt Tue Jun 1 14:24:21 2010 (r34573) +++ lyx-devel/branches/BRANCH_1_6_X/development/cmake/lyx2lyx/CMakeLists.txt Tue Jun 1 14:46:35 2010 (r34574) @@ -1,7 +1,7 @@ # This file is part of LyX, the document processor. # Licence details can be found in the file COPYING. # -# Copyright (c) 2008-2010 Peter Kümmel, <[email protected]> +# Copyright (c) 2008-2010 Peter K�mmel, <[email protected]> # Copyright (c) 2008-2010 Kornel Benko, <[email protected]> # Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/pcheaders.h ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/development/cmake/pcheaders.h Tue Jun 1 14:24:21 2010 (r34573) +++ lyx-devel/branches/BRANCH_1_6_X/development/cmake/pcheaders.h Tue Jun 1 14:46:35 2010 (r34574) @@ -18,11 +18,7 @@ #include <boost/crc.hpp> #include <boost/cregex.hpp> #include <boost/current_function.hpp> -//#include <boost/filesystem/operations.hpp> #include <boost/function.hpp> -//#include <boost/iostreams/device/file.hpp> -//#include <boost/iostreams/filter/gzip.hpp> -//#include <boost/iostreams/filtering_streambuf.hpp> #include <boost/iterator/indirect_iterator.hpp> #include <boost/optional.hpp> #include <boost/regex.hpp> Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/client/CMakeLists.txt ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/client/CMakeLists.txt Tue Jun 1 14:24:21 2010 (r34573) +++ lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/client/CMakeLists.txt Tue Jun 1 14:46:35 2010 (r34574) @@ -20,19 +20,19 @@ target_link_libraries(${_lyxclient} support - boost_regex + ${Lyx_Boost_Libraries} ${LIBINTL_LIBRARIES} - ${ICONV_LIBRARY} + ${ICONV_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ) if (ASPELL_FOUND) - target_link_libraries(${_lyxclient} ${ASPELL_LIBRARY}) + target_link_libraries(${_lyxclient} ${ASPELL_LIBRARY}) endif() if (APPLE) - target_link_libraries(${_lyxclient} "-framework Carbon") + target_link_libraries(${_lyxclient} "-framework Carbon") endif() install(TARGETS ${_lyxclient} DESTINATION bin) Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/frontends/CMakeLists.txt ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/frontends/CMakeLists.txt Tue Jun 1 14:24:21 2010 (r34573) +++ lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/frontends/CMakeLists.txt Tue Jun 1 14:46:35 2010 (r34574) @@ -15,7 +15,6 @@ lyx_add_msvc_pch(frontends) - if(NOT MERGE_FILES) add_library(frontends ${library_type} ${frontends_sources} ${frontends_headers}) else() @@ -23,7 +22,7 @@ add_library(frontends ${library_type} ${_allinone_files}) endif() -target_link_libraries(frontends boost_regex) +target_link_libraries(frontends ${Lyx_Boost_Libraries}) project_source_group("${GROUP_CODE}" frontends_sources frontends_headers) Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/support/CMakeLists.txt ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/support/CMakeLists.txt Tue Jun 1 14:24:21 2010 (r34573) +++ lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/support/CMakeLists.txt Tue Jun 1 14:46:35 2010 (r34574) @@ -67,7 +67,7 @@ ${support_mythes_sources} ${support_linkback_sources} ${support_headers} ${dont_merge}) endif() -target_link_libraries(support boost_signals ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY}) +target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY}) lyx_add_gcc_pch(support) Modified: lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/tex2lyx/CMakeLists.txt ============================================================================== --- lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/tex2lyx/CMakeLists.txt Tue Jun 1 14:24:21 2010 (r34573) +++ lyx-devel/branches/BRANCH_1_6_X/development/cmake/src/tex2lyx/CMakeLists.txt Tue Jun 1 14:46:35 2010 (r34574) @@ -40,7 +40,7 @@ target_link_libraries(${_tex2lyx} support - boost_regex + ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${LIBINTL_LIBRARIES} ${ICONV_LIBRARY})
