Core/Build: Enable Clang PCH support and OS X specific features

Core: Fix warnings here and there
This commit is contained in:
Spp committed 2012-11-09 13:13:45 +01:00
1 parent 90c95806a7
commit 333b8e5159
53 files changed
+506 -941

No files matched your search

+10 -15
View File
@@ -28,11 +28,9 @@ file(GLOB sources_localdir *.cpp *.h)
# Build shared sourcelist
#
if( USE_COREPCH AND MSVC )
set(shared_STAT_SRCS
PrecompiledHeaders/sharedPCH.cpp
PrecompiledHeaders/sharedPCH.h
)
if (USE_COREPCH)
set(shared_STAT_PCH_HDR PrecompiledHeaders/sharedPCH.h)
set(shared_STAT_PCH_SRC PrecompiledHeaders/sharedPCH.cpp)
endif()
set(shared_STAT_SRCS
@@ -51,7 +49,6 @@ set(shared_STAT_SRCS
)
include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/dep/SFMT
${CMAKE_SOURCE_DIR}/dep/sockets/include
${CMAKE_SOURCE_DIR}/dep/utf8cpp
@@ -73,18 +70,16 @@ include_directories(
${OPENSSL_INCLUDE_DIR}
)
add_library(shared STATIC ${shared_STAT_SRCS})
add_library(shared STATIC
${shared_STAT_SRCS}
${shared_STAT_PCH_SRC}
)
target_link_libraries(shared
${ACE_LIBRARY}
)
# Generate precompiled header
if( USE_COREPCH )
if(CMAKE_COMPILER_IS_GNUCXX)
add_precompiled_header(shared ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/sharedPCH.h)
elseif(MSVC)
add_native_precompiled_header(shared ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/sharedPCH)
endif()
endif()
if (USE_COREPCH)
add_cxx_pch(shared ${shared_STAT_PCH_HDR} ${shared_STAT_PCH_SRC})
endif ()