Author: uwestoehr Date: Sun May 15 19:14:31 2011 New Revision: 38767 URL: http://www.lyx.org/trac/changeset/38767
Log: revert r38758 as discussed in http://www.mail-archive.com/[email protected]/msg169087.html Deleted: lyx-devel/branches/BRANCH_2_0_X/boost/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/boost/libs/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/boost/libs/regex/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/boost/libs/signals/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/lib/lyx2lyx/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/lib/scripts/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/po/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/frontends/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/graphics/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/insets/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/mathed/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/support/CMakeLists.txt lyx-devel/branches/BRANCH_2_0_X/src/tex2lyx/CMakeLists.txt Modified: lyx-devel/branches/BRANCH_2_0_X/development/cmake/PyCompile.cmake lyx-devel/branches/BRANCH_2_0_X/development/cmake/build.bat lyx-devel/branches/BRANCH_2_0_X/development/cmake/config.h.cmake lyx-devel/branches/BRANCH_2_0_X/development/cmake/configCompiler.h.msvc Modified: lyx-devel/branches/BRANCH_2_0_X/development/cmake/PyCompile.cmake ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/development/cmake/PyCompile.cmake Sun May 15 15:37:18 2011 (r38766) +++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/PyCompile.cmake Sun May 15 19:14:31 2011 (r38767) @@ -36,8 +36,8 @@ COMMAND ${py_compile} ${_copied_py} DEPENDS ${_copied_py} ) - SET_SOURCE_FILES_PROPERTIES(${_copied_py} GENERATED) - install(PROGRAMS ${_compiled_py_} ${_copied_py} DESTINATION ${_project}) + SET_SOURCE_FILES_PROPERTIES(${_copied_py} ${_created_py_} GENERATED) + install(FILES ${_compiled_py_} DESTINATION ${_project}) LIST(APPEND _generated ${_compiled_py_}) endforeach(_orig_py) Modified: lyx-devel/branches/BRANCH_2_0_X/development/cmake/build.bat ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/development/cmake/build.bat Sun May 15 15:37:18 2011 (r38766) +++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/build.bat Sun May 15 19:14:31 2011 (r38767) @@ -67,7 +67,7 @@ REM Delete all files indirectory -del /s/q * +::del /s/q * del CMakeCache.txt if [%2]==[] ( Modified: lyx-devel/branches/BRANCH_2_0_X/development/cmake/config.h.cmake ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/development/cmake/config.h.cmake Sun May 15 15:37:18 2011 (r38766) +++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/config.h.cmake Sun May 15 19:14:31 2011 (r38767) @@ -13,9 +13,9 @@ #define _CONFIG_H // obligatory flags -#define QT_NO_STL 1 -#define QT_NO_KEYWORDS 1 -#define HAVE_ICONV 1 +#define QT_NO_STL +#define QT_NO_KEYWORDS +#define HAVE_ICONV #include "configCompiler.h" @@ -75,42 +75,7 @@ #cmakedefine LYX_NLS 1 #ifdef LYX_NLS -#define ENABLE_NLS 1 -// These are needed when building included gettext (taken from autoconf macro) -#cmakedefine LYX_EXTERNAL_LIBINTL 1 -#if !defined(LYX_EXTERNAL_LIBINTL) -// this only makes sense when LYX_EXTERNAL_LIBINTL is OFF. -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded -#define hash_string libintl_hash_string -#endif /* LYX_EXTERNAL_LIBINTL */ +#define ENABLE_NLS #endif Modified: lyx-devel/branches/BRANCH_2_0_X/development/cmake/configCompiler.h.msvc ============================================================================== --- lyx-devel/branches/BRANCH_2_0_X/development/cmake/configCompiler.h.msvc Sun May 15 15:37:18 2011 (r38766) +++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/configCompiler.h.msvc Sun May 15 19:14:31 2011 (r38767) @@ -43,7 +43,6 @@ #define HAVE__PCLOSE 1 #define HAVE_GETPID 1 #define HAVE__GETPID 1 -#define HAVE_GETTEXT 1 /* TODO this is set manually */ #define HAVE_MKDIR 1 #define HAVE__MKDIR 1 /* #undef HAVE_SETENV 1 */
