fix cmake file for minizip

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20049 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2007-09-04 19:26:57 +00:00
parent 9924c11950
commit b24aa27003

View File

@ -9,9 +9,9 @@ project(support)
file(GLOB support_sources ${TOP_SRC_DIR}/src/support/${LYX_CPP_FILES}) file(GLOB support_sources ${TOP_SRC_DIR}/src/support/${LYX_CPP_FILES})
file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES}) file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES})
file(GLOB support_minzip_sources ${TOP_SRC_DIR}/src/support/minizip/*.c) file(GLOB support_minizip_sources ${TOP_SRC_DIR}/src/support/minizip/*.c)
file(GLOB support_minzip_cpp_sources ${TOP_SRC_DIR}/src/support/minizip/*.cpp) file(GLOB support_minizip_cpp_sources ${TOP_SRC_DIR}/src/support/minizip/*.cpp)
file(GLOB support_min_zip_headers ${TOP_SRC_DIR}/src/support/minizip/*.h) file(GLOB support_minizip_headers ${TOP_SRC_DIR}/src/support/minizip/*.h)
list(REMOVE_ITEM support_sources list(REMOVE_ITEM support_sources
${TOP_SRC_DIR}/src/support/os_win32.cpp ${TOP_SRC_DIR}/src/support/os_win32.cpp
@ -32,13 +32,13 @@ include_directories(${TOP_SRC_DIR}/src/support
if(NOT MERGE_FILES) if(NOT MERGE_FILES)
set(support_sources ${support_sources} ${support_minzip_sources}) set(support_sources ${support_sources} ${support_minizip_sources} ${support_minizip_cpp_sources})
set(support_headers ${support_headers} ${support_minzip_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})
else() else()
lyx_const_touched_files(_allinone support_sources) lyx_const_touched_files(_allinone support_sources)
add_library(support ${library_type} ${_allinone_files} add_library(support ${library_type} ${_allinone_files}
${support_minzip_sources} ${support_minzip_cpp_sources}) ${support_minizip_sources} ${support_minizip_cpp_sources})
endif() endif()