commit 2b0511510a6a3061851b2996bb39e5c157a22408
Author: Kornel Benko <[email protected]>
Date:   Thu Jun 12 07:49:17 2014 +0200

    Cmake build: Added magic library to some link commands.
    
    Needed due to the use of magic_(open|load|error|file|close) after recent 
changes.

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index c401fe7..c7accee 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -30,7 +30,8 @@ target_link_libraries(${_lyxclient}
        ${Lyx_Boost_Libraries}
        ${ICONV_LIBRARY}
        ${QT_QTCORE_LIBRARY}
-       ${QT_QTGUI_LIBRARY})
+       ${QT_QTGUI_LIBRARY}
+        ${Magic_LIBRARY})
 
 if(ASPELL_FOUND)
        target_link_libraries(${_lyxclient} ${ASPELL_LIBRARY})
diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index eac5aa7..ed4f9bb 100644
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ macro(sources _program)
        add_executable(${_program} ${_tmplist})
        target_link_libraries(${_program} support
                ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
-               ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
+               ${ZLIB_LIBRARY} ${ICONV_LIBRARY} ${Magic_LIBRARY})
 endmacro()
 
 file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES})
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 0a45ad5..2d7aa0c 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -18,7 +18,7 @@ add_executable(check_layout ${check_layout_SOURCES})
 
 target_link_libraries(check_layout support
   ${Lyx_Boost_Libraries} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY}
-  ${ZLIB_LIBRARY} ${ICONV_LIBRARY})
+  ${ZLIB_LIBRARY} ${ICONV_LIBRARY} ${Magic_LIBRARY})
 
 add_dependencies(lyx_run_tests check_layout)
 set_target_properties(check_layout PROPERTIES FOLDER "tests/src")
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index c7ec504..ed827bb 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -48,7 +48,8 @@ target_link_libraries(${_tex2lyx}
        ${Lyx_Boost_Libraries}
        ${QT_QTCORE_LIBRARY}
        ${QT_QTGUI_LIBRARY}
-       ${ICONV_LIBRARY})
+       ${ICONV_LIBRARY}
+        ${Magic_LIBRARY})
 
 add_dependencies(${_tex2lyx} lyx_version)
 

Reply via email to