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

Fix building with cmake on cygwin.

Browse Source 
Add required libraries for the link stage.
This commit is contained in:
Enrico Forestieri 2014-12-26 17:00:23 +01:00
parent 9126a99e97
commit 1b0cbb6932
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -149,6 +149,10 @@ if(MINGW)
target_link_libraries(${_lyx} ole32) target_link_libraries(${_lyx} ole32)
endif() endif()
if(CYGWIN)
target_link_libraries(${_lyx} gdi32 shlwapi ole32)
endif()
project_source_group("${GROUP_CODE}" lyx_sources lyx_headers) project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
install(TARGETS ${_lyx} install(TARGETS ${_lyx}

4
src/client/CMakeLists.txt
View File

@ -38,5 +38,9 @@ if(APPLE)
target_link_libraries(${_lyxclient} "-framework AppKit") target_link_libraries(${_lyxclient} "-framework AppKit")
endif() endif()
if(CYGWIN)
target_link_libraries(${_lyxclient} shlwapi)
endif()
install(TARGETS ${_lyxclient} DESTINATION ${LYX_UTILITIES_INSTALL_PATH}) install(TARGETS ${_lyxclient} DESTINATION ${LYX_UTILITIES_INSTALL_PATH})

3
src/support/tests/CMakeLists.txt
View File

@ -17,6 +17,9 @@ macro(sources _program)
${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${ZLIB_LIBRARY} ${ICONV_LIBRARY}) ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
lyx_target_link_libraries(${_program} Magic) lyx_target_link_libraries(${_program} Magic)
if(CYGWIN)
target_link_libraries(${_program} shlwapi)
endif()
endmacro() endmacro()
file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES}) file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES})

3
src/tests/CMakeLists.txt
View File

@ -19,6 +19,9 @@ add_executable(check_layout ${check_layout_SOURCES})
target_link_libraries(check_layout support target_link_libraries(check_layout support
${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
${ZLIB_LIBRARY} ${ICONV_LIBRARY}) ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
if(CYGWIN)
target_link_libraries(check_layout shlwapi)
endif()
lyx_target_link_libraries(check_layout Magic) lyx_target_link_libraries(check_layout Magic)
add_dependencies(lyx_run_tests check_layout) add_dependencies(lyx_run_tests check_layout)

4
src/tex2lyx/CMakeLists.txt
View File

@ -58,6 +58,10 @@ if(WIN32)
target_link_libraries(${_tex2lyx} shlwapi ole32 psapi) target_link_libraries(${_tex2lyx} shlwapi ole32 psapi)
endif() endif()
if(CYGWIN)
target_link_libraries(${_tex2lyx} shlwapi ole32)
endif()
if(APPLE) if(APPLE)
target_link_libraries(${_tex2lyx} "-framework AppKit") target_link_libraries(${_tex2lyx} "-framework AppKit")
endif() endif()