anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove now unneeded checks for mythes and aiksaurus.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29579 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2009-05-09 06:57:25 +00:00
parent 58c20777af
commit a897a1189a
3 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
development/cmake/CMakeLists.txt
View File

@ -372,19 +372,7 @@ else()
include(ConfigureChecks.cmake) include(ConfigureChecks.cmake)
configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h) configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h)
endif() 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) configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
find_package(ICONV REQUIRED) find_package(ICONV REQUIRED)

6
development/cmake/config.h.cmake
View File

@ -41,10 +41,4 @@
#cmakedefine USE_MACOSX_PACKAGING 1 #cmakedefine USE_MACOSX_PACKAGING 1
#cmakedefine PATH_MAX ${PATH_MAX} #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 #endif

8
development/cmake/src/CMakeLists.txt
View File

@ -83,14 +83,6 @@ if (MINGW)
target_link_libraries(${_lyx} ole32) target_link_libraries(${_lyx} ole32)
endif() 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) project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
install(TARGETS ${_lyx} DESTINATION bin) install(TARGETS ${_lyx} DESTINATION bin)