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 6aad4f956a1a92ec6935cf4052b5787be2343e9b..08cca220e0bf3a7c90d7367fa64b120aa27196a5 100644 (file)
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -1,81 +1,52 @@
-project(support)
-
-configure_file(package.C.cmake ${CMAKE_CURRENT_BINARY_DIR}/package.C)
-
-set(support_sources
-       FileMonitor.h
-       FileMonitor.C
-       RandomAccessList.h
-       abort.C
-       chdir.C
-       convert.C
-       convert.h
-       copy.C
-       copied_ptr.h
-       cow_ptr.h
-       debugstream.h
-       environment.h
-       environment.C
-       filefilterlist.C
-       filefilterlist.h
-       filename.C
-       filename.h
-       filetools.C
-       filetools.h
-       forkedcall.C
-       forkedcall.h
-       forkedcallqueue.C
-       forkedcallqueue.h
-       forkedcontr.C
-       forkedcontr.h
-       fs_extras.C
-       fs_extras.h
-       getcwd.C
-       kill.C
-       limited_stack.h
-       lstrings.C
-       lstrings.h
-       lyxalgo.h
-       lyxlib.h
-       lyxmanip.h
-       lyxtime.C
-       lyxtime.h
-       lyxsum.C
-       mkdir.C
-       os.C
-       os.h
-       path.C
-       path.h
-       package.h
-       rename.C
-       socktools.C
-       socktools.h
-       std_istream.h
-       std_ostream.h
-       systemcall.C
-       systemcall.h
-       tempname.C
-       textutils.h
-       translator.h
-       types.h
-       userinfo.C
-       userinfo.h
-       unlink.C
-)
-
+# This file is part of LyX, the document processor.
+# Licence details can be found in the file COPYING.
+#
+# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
+#
 
+project(support)
 
-lyx_add_path(support_sources ${TOP_SRC_DIR}/src/support)
-
-include_directories(${TOP_SRC_DIR}/src/support)
+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_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
+       ${TOP_SRC_DIR}/src/support/os_unix.cpp
+       ${TOP_SRC_DIR}/src/support/os_cygwin.cpp
+       ${TOP_SRC_DIR}/src/support/os_os2.C
+       ${TOP_SRC_DIR}/src/support/atexit.c
+       ${TOP_SRC_DIR}/src/support/strerror.c
+       ${TOP_SRC_DIR}/src/support/minizip/iowin32.h
+       ${TOP_SRC_DIR}/src/support/minizip/iowin32.c)
+
+lyx_add_msvc_pch(support)
+       
+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_minizip_sources} ${support_minizip_cpp_sources})
+       set(support_headers ${support_headers} ${support_minizip_headers})
+       add_library(support ${library_type} ${support_sources} ${support_headers})
+else()
+       lyx_const_touched_files(_allinone  support_sources)
+       add_library(support ${library_type} ${_allinone_files}
+               ${support_minizip_sources} ${support_minizip_cpp_sources})
+endif()
 
-add_library(support STATIC ${support_sources} ${CMAKE_CURRENT_BINARY_DIR}/package.C)
 
 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)