From a897a1189a70cda3036aa9fa63ab210967654df6 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 9 May 2009 06:57:25 +0000 Subject: [PATCH] Remove now unneeded checks for mythes and aiksaurus. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29579 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 14 +------------- development/cmake/config.h.cmake | 6 ------ development/cmake/src/CMakeLists.txt | 8 -------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index b3bcc12a0e..cdbdf219e8 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -372,19 +372,7 @@ else() include(ConfigureChecks.cmake) configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h) endif() -find_package(MyThesLIB) -if(MYTHESLIB_FOUND) - # Variables in config.h will be set correctly with configure_file() - set(HAVE_LIBMYTHES 1) - set(MYTHES_H_LOCATION 1) -else() - find_package(AiksaurusLIB) - if(AIKSAURUSLIB_FOUND) - # Variables in config.h will be set correctly with configure_file() - set(HAVE_LIBAIKSAURUS 1) - set(AIKSAURUS_H_LOCATION 1) - endif() -endif() + configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h) find_package(ICONV REQUIRED) diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake index edb8f8d2b2..ab3e539ef3 100644 --- a/development/cmake/config.h.cmake +++ b/development/cmake/config.h.cmake @@ -41,10 +41,4 @@ #cmakedefine USE_MACOSX_PACKAGING 1 #cmakedefine PATH_MAX ${PATH_MAX} -#cmakedefine HAVE_LIBMYTHES 1 -#cmakedefine MYTHES_H_LOCATION <${MYTHES_H}> - -#cmakedefine HAVE_LIBAIKSAURUS 1 -#cmakedefine AIKSAURUS_H_LOCATION <${AIKSAURUS_H}> - #endif diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt index c494b1868b..08043da04a 100644 --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -83,14 +83,6 @@ if (MINGW) target_link_libraries(${_lyx} ole32) endif() -if (MYTHESLIB_LIBRARY) - target_link_libraries(${_lyx} ${MYTHESLIB_LIBRARY}) -else() - if (AIKSAURUSLIB_LIBRARY) - target_link_libraries(${_lyx} ${AIKSAURUSLIB_LIBRARY}) - endif() -endif() - project_source_group("${GROUP_CODE}" lyx_sources lyx_headers) install(TARGETS ${_lyx} DESTINATION bin) -- 2.39.2