fix compilation on Mac, patch from Stefan.

[lyx.git] / development / cmake / src / support / CMakeLists.txt

diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index 0221d64d6736e38cd8c3aeed987f30f754999a62..08cca220e0bf3a7c90d7367fa64b120aa27196a5 100644 (file)
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -6,14 +6,12 @@
 
 project(support)
 
-configure_file(${TOP_SRC_DIR}/src/support/Package.cpp.in 
-               ${CMAKE_CURRENT_BINARY_DIR}/package.C)
-
 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_minzip_sources ${TOP_SRC_DIR}/src/support/minizip/*.c)
-file(GLOB support_min_zip_headers ${TOP_SRC_DIR}/src/support/minizip/*.h)
+file(GLOB support_minizip_sources ${TOP_SRC_DIR}/src/support/minizip/*.c)
+file(GLOB support_minizip_cpp_sources ${TOP_SRC_DIR}/src/support/minizip/*.cpp)
+file(GLOB support_minizip_headers ${TOP_SRC_DIR}/src/support/minizip/*.h)
 
 list(REMOVE_ITEM support_sources       
        ${TOP_SRC_DIR}/src/support/os_win32.cpp
@@ -25,34 +23,30 @@ list(REMOVE_ITEM support_sources
        ${TOP_SRC_DIR}/src/support/minizip/iowin32.h
        ${TOP_SRC_DIR}/src/support/minizip/iowin32.c)
 
-set(support_sources ${support_sources} ${CMAKE_CURRENT_BINARY_DIR}/package.C)
-
 lyx_add_msvc_pch(support)
        
-include_directories(${TOP_SRC_DIR}/src/support ${TOP_SRC_DIR}/src/support/minizip ${ICONV_INCLUDE_DIR})
+include_directories(${TOP_SRC_DIR}/src/support
+       ${TOP_SRC_DIR}/src/support/minizip
+       ${QT_INCLUDES}
+       ${ICONV_INCLUDE_DIR})
 
 
 if(NOT MERGE_FILES)
-       set(support_sources ${support_sources} ${support_minzip_sources})
-       set(support_headers ${support_headers} ${support_minzip_headers})
+       set(support_sources ${support_sources} ${support_minizip_sources} ${support_minizip_cpp_sources})
+       set(support_headers ${support_headers} ${support_minizip_headers})
        add_library(support ${library_type} ${support_sources} ${support_headers})
-else(NOT MERGE_FILES)
-       # move to front
-       list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/convert.cpp)
-       list(APPEND support_sources ${TOP_SRC_DIR}/src/support/convert.cpp)
-       list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/lstrings.cpp)
-       list(APPEND support_sources ${TOP_SRC_DIR}/src/support/lstrings.cpp)
-       list(REVERSE support_sources)
+else()
        lyx_const_touched_files(_allinone  support_sources)
-       add_library(support ${library_type} ${_allinone_files} ${support_minzip_sources})
-endif(NOT MERGE_FILES)
+       add_library(support ${library_type} ${_allinone_files}
+               ${support_minizip_sources} ${support_minizip_cpp_sources})
+endif()
 
 
 target_link_libraries(support boost_signals)
 
 if(WIN32)
        target_link_libraries(support shlwapi)
-endif(WIN32)
+endif()
 
 project_source_group("${GROUP_CODE}" support_sources support_headers)