mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 10:58:52 +00:00
cmake: fix tex2lyx linker error
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22010 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
a30f67ed98
commit
90425dd080
@ -21,7 +21,11 @@ list(REMOVE_ITEM support_sources
|
|||||||
${TOP_SRC_DIR}/src/support/atexit.c
|
${TOP_SRC_DIR}/src/support/atexit.c
|
||||||
${TOP_SRC_DIR}/src/support/strerror.c
|
${TOP_SRC_DIR}/src/support/strerror.c
|
||||||
${TOP_SRC_DIR}/src/support/minizip/iowin32.h
|
${TOP_SRC_DIR}/src/support/minizip/iowin32.h
|
||||||
${TOP_SRC_DIR}/src/support/minizip/iowin32.c)
|
${TOP_SRC_DIR}/src/support/minizip/iowin32.c
|
||||||
|
${TOP_SRC_DIR}/src/support/gettext.cpp)
|
||||||
|
|
||||||
|
# needed to compile tex2lyx in merged mode
|
||||||
|
set(dont_merge ${TOP_SRC_DIR}/src/support/gettext.cpp)
|
||||||
|
|
||||||
lyx_add_msvc_pch(support)
|
lyx_add_msvc_pch(support)
|
||||||
|
|
||||||
@ -37,7 +41,7 @@ include_directories(${TOP_SRC_DIR}/src/support
|
|||||||
if(NOT MERGE_FILES)
|
if(NOT MERGE_FILES)
|
||||||
set(support_sources ${support_sources} ${support_minizip_sources} ${support_minizip_cpp_sources})
|
set(support_sources ${support_sources} ${support_minizip_sources} ${support_minizip_cpp_sources})
|
||||||
set(support_headers ${support_headers} ${support_minizip_headers})
|
set(support_headers ${support_headers} ${support_minizip_headers})
|
||||||
add_library(support ${library_type} ${support_sources} ${support_headers})
|
add_library(support ${library_type} ${support_sources} ${support_headers} ${dont_merge})
|
||||||
else()
|
else()
|
||||||
lyx_const_touched_files(_allinone support_sources)
|
lyx_const_touched_files(_allinone support_sources)
|
||||||
set(depends_moc ${support_headers})
|
set(depends_moc ${support_headers})
|
||||||
@ -46,7 +50,7 @@ else()
|
|||||||
set_source_files_properties(_allinone_touched.C
|
set_source_files_properties(_allinone_touched.C
|
||||||
PROPERTIES OBJECT_DEPENDS "${depends_moc}")
|
PROPERTIES OBJECT_DEPENDS "${depends_moc}")
|
||||||
add_library(support ${library_type} ${_allinone_files}
|
add_library(support ${library_type} ${_allinone_files}
|
||||||
${support_minizip_sources} ${support_minizip_cpp_sources} ${support_headers})
|
${support_minizip_sources} ${support_minizip_cpp_sources} ${support_headers} ${dont_merge})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user