diff -urNp FlightCrew-0.7.1-Code.orig/CMakeLists.txt FlightCrew-0.7.1-Code/CMakeLists.txt
--- FlightCrew-0.7.1-Code.orig/CMakeLists.txt 2010-11-11 19:05:50.000000000 +0200
+++ FlightCrew-0.7.1-Code/CMakeLists.txt 2010-11-13 13:47:08.404722273 +0200
@@ -42,10 +42,14 @@ set( CMAKE_OSX_SYSROOT "/Developer/SDKs/
set( CMAKE_OSX_ARCHITECTURES "i386;x86_64" )
# The parsing order is significant!
+if( NOT UNIX )
add_subdirectory( src/BoostParts )
add_subdirectory( src/Xerces )
+endif()
add_subdirectory( src/XercesExtensions )
+if( NOT UNIX )
add_subdirectory( src/zlib )
+endif()
add_subdirectory( src/zipios )
add_subdirectory( src/googlemock )
add_subdirectory( src/FlightCrew )
diff -urNp FlightCrew-0.7.1-Code.orig/src/FlightCrew/CMakeLists.txt FlightCrew-0.7.1-Code/src/FlightCrew/CMakeLists.txt
--- FlightCrew-0.7.1-Code.orig/src/FlightCrew/CMakeLists.txt 2010-11-11 19:05:50.000000000 +0200
+++ FlightCrew-0.7.1-Code/src/FlightCrew/CMakeLists.txt 2010-11-13 13:47:08.404722273 +0200
@@ -80,8 +80,14 @@ else()
add_library( ${PROJECT_NAME} ${SOURCES} )
endif()
-target_link_libraries( ${PROJECT_NAME} zipios BoostParts XercesExtensions )
-
+target_link_libraries( ${PROJECT_NAME} zipios XercesExtensions )
+if ( UNIX )
+ # These seem to not be actually currently used, left just in case
+ # this changes in the future (-Wl,--as-needed pulls them out until then)
+ target_link_libraries( ${PROJECT_NAME} boost_date_time boost_thread )
+else()
+ target_link_libraries( ${PROJECT_NAME} BoostParts )
+endif()
#############################################################################
# Xcode PCH support. Has to come after the target is created.
diff -urNp FlightCrew-0.7.1-Code.orig/src/FlightCrew/CMakeLists.txt.orig FlightCrew-0.7.1-Code/src/FlightCrew/CMakeLists.txt.orig
--- FlightCrew-0.7.1-Code.orig/src/FlightCrew/CMakeLists.txt.orig 1970-01-01 02:00:00.000000000 +0200
+++ FlightCrew-0.7.1-Code/src/FlightCrew/CMakeLists.txt.orig 2010-11-11 19:05:50.000000000 +0200
@@ -0,0 +1,135 @@
+########################################################
+#
+# This is a CMake configuration file.
+# To use it you need CMake which can be
+# downloaded from here:
+# http://www.cmake.org/cmake/resources/software.html
+#
+#########################################################
+
+cmake_minimum_required( VERSION 2.8 )
+
+# Print a message and fail for people who don't
+# read the build instructions and then complain
+# when the build process fails for them.
+if ( ${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR} )
+ message( FATAL_ERROR "You are trying to run CMake from the <top_folder>/src/FlightCrew directory, "
+ "instead of just from the <top_folder> directory.\nDO NOT DO THIS.\n"
+ "The correct way looks like this:\n"
+ " cmake -G '<generator_name>' /path/to/topmost/folder/in/source/package\n"
+ "You will probably now need to first clean your build directory." )
+endif()
+
+#############################################################################
+
+project( FlightCrew )
+
+file( GLOB_RECURSE SOURCES *.h *.cpp *.xsd *.dtd )
+
+# The test sources are a part of a different target, so we remove them
+file( GLOB_RECURSE to_remove tests/*.h tests/*.cpp )
+list( REMOVE_ITEM SOURCES ${to_remove} )
+
+#############################################################################
+
+# Creating source groups for VS, Xcode
+include( ${CMAKE_SOURCE_DIR}/cmake_extras/FileSystemSourceGroups.cmake )
+create_source_groups( SOURCES )
+
+#############################################################################
+
+set( PCH_NAME stdafx )
+
+# stdafx.cpp is compiled separately as a PCH
+file( GLOB to_remove ${PCH_NAME}.cpp )
+list( REMOVE_ITEM SOURCES ${to_remove} )
+
+#############################################################################
+
+# creating PCH's for MSVC and GCC on Linux
+include( ${CMAKE_SOURCE_DIR}/cmake_extras/CustomPCH.cmake )
+set( ALL_INCLUDES ${BoostParts_SOURCE_DIR}
+ ${Xerces_SOURCE_DIR}
+ ${zipios_SOURCE_DIR} )
+set( GCC_PCH_TARGET gccPCH_fc )
+
+precompiled_header( SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} )
+
+#############################################################################
+
+# We need to pick up the stdafx.h file (current source dir),
+# the stdafx.h.gch file (current binary dir)
+# and the headers for the linked-to libraries
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ../zipios
+ ../BoostParts
+ ../Xerces
+ ../XercesExtensions
+ ../utf8-cpp
+ )
+
+link_directories ( ${PROJECT_BINARY_DIR}/lib )
+
+if( BUILD_SHARED_FC )
+ # Windows clients also need to specify FC_BUILT_AS_DLL
+ # when they want a dll, but NOT FC_DLL_EXPORTING
+ add_definitions( -DFC_DLL_EXPORTING -DFC_BUILT_AS_DLL )
+ add_library( ${PROJECT_NAME} SHARED ${SOURCES} )
+else()
+ add_library( ${PROJECT_NAME} ${SOURCES} )
+endif()
+
+target_link_libraries( ${PROJECT_NAME} zipios BoostParts XercesExtensions )
+
+#############################################################################
+
+# Xcode PCH support. Has to come after the target is created.
+if( APPLE )
+ set_target_properties(
+ ${PROJECT_NAME}
+ PROPERTIES
+ XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/${PCH_NAME}.h"
+ XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES"
+ )
+endif()
+
+#############################################################################
+
+# "Link time code generation" flags for MSVC
+# TODO: split into special cmake file
+if( MSVC )
+ add_definitions( /DUNICODE /D_UNICODE /W4 )
+
+ # This warning is present only at the highest warning level (/W4)
+ # and is routinely disabled because it complains about valid
+ # constructs like "while (true)"
+ add_definitions( /wd4127 )
+
+ # The /Zc:wchar_t- flag can't go into add_definitions
+ # because the RC compiler picks it up too and it provokes a name clash
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:wchar_t-")
+ set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL" )
+ set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG" )
+
+elseif( CMAKE_COMPILER_IS_GNUCXX )
+ # "Print all warnings" flag for GCC
+ add_definitions( -Wall )
+
+ # Make sure the PCH is built for GCC
+ add_dependencies( ${PROJECT_NAME} ${GCC_PCH_TARGET} )
+endif()
+
+# needed for correct Xerces header inclusion
+add_definitions( -DXERCES_STATIC_LIBRARY )
+
+#############################################################################
+
+# We don't build the tests when fc is built as a shared
+# library on msvc since the tests need access to the fc
+# internal apis which are not exported when building a DLL.
+# If we tried to build them, we would get linker errors.
+# We also don't build the tests if the user specified it.
+if( NOT ( BUILD_SHARED_FC AND MSVC ) AND NOT NO_TEST_EXE )
+ add_subdirectory( tests )
+endif()
diff -urNp FlightCrew-0.7.1-Code.orig/src/FlightCrew-cli/CMakeLists.txt FlightCrew-0.7.1-Code/src/FlightCrew-cli/CMakeLists.txt
--- FlightCrew-0.7.1-Code.orig/src/FlightCrew-cli/CMakeLists.txt 2010-11-11 19:05:50.000000000 +0200
+++ FlightCrew-0.7.1-Code/src/FlightCrew-cli/CMakeLists.txt 2010-11-13 13:47:08.404722273 +0200
@@ -39,7 +39,7 @@ link_directories ( ${PROJECT_BINARY_DIR}
add_executable( ${PROJECT_NAME} ${SOURCES} )
-target_link_libraries( ${PROJECT_NAME} FlightCrew )
+target_link_libraries( ${PROJECT_NAME} FlightCrew boost_program_options )
#############################################################################
diff -urNp FlightCrew-0.7.1-Code.orig/src/utf8-cpp/utf8/core.h FlightCrew-0.7.1-Code/src/utf8-cpp/utf8/core.h
--- FlightCrew-0.7.1-Code.orig/src/utf8-cpp/utf8/core.h 2010-11-11 19:05:50.000000000 +0200
+++ FlightCrew-0.7.1-Code/src/utf8-cpp/utf8/core.h 2010-11-13 13:47:08.404722273 +0200
@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE.
#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
#include <iterator>
-#include "../../BoostParts/boost/cstdint.hpp"
+#include <boost/cstdint.hpp>
namespace utf8
{
diff -urNp FlightCrew-0.7.1-Code.orig/src/XercesExtensions/CMakeLists.txt FlightCrew-0.7.1-Code/src/XercesExtensions/CMakeLists.txt
--- FlightCrew-0.7.1-Code.orig/src/XercesExtensions/CMakeLists.txt 2010-11-11 19:05:50.000000000 +0200
+++ FlightCrew-0.7.1-Code/src/XercesExtensions/CMakeLists.txt 2010-11-13 13:47:08.405722203 +0200
@@ -23,7 +23,7 @@ link_directories ( ${PROJECT_BINARY_DIR}
add_library( ${PROJECT_NAME} ${SOURCES} )
-target_link_libraries( ${PROJECT_NAME} Xerces )
+target_link_libraries( ${PROJECT_NAME} xerces-c )
#############################################################################
diff -urNp FlightCrew-0.7.1-Code.orig/src/zipios/CMakeLists.txt FlightCrew-0.7.1-Code/src/zipios/CMakeLists.txt
--- FlightCrew-0.7.1-Code.orig/src/zipios/CMakeLists.txt 2010-11-11 19:05:50.000000000 +0200
+++ FlightCrew-0.7.1-Code/src/zipios/CMakeLists.txt 2010-11-13 13:47:08.405722203 +0200
@@ -25,7 +25,12 @@ link_directories ( ${PROJECT_BINARY_DIR}
add_library( ${PROJECT_NAME} ${SOURCES} )
-target_link_libraries( ${PROJECT_NAME} zlib BoostParts )
+target_link_libraries( ${PROJECT_NAME} z )
+if ( UNIX )
+ target_link_libraries( ${PROJECT_NAME} boost_filesystem boost_regex )
+else()
+ target_link_libraries( ${PROJECT_NAME} BoostParts )
+endif()
#############################################################################
