From 02e7aedc087f62ae8580083ee3d18b7f009e21e1 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Sun, 11 Aug 2013 14:38:51 +0200 Subject: [PATCH] Added boost and fixed build options. --- CMakeLists.txt | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d041298..ae3800e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,10 @@ cmake_minimum_required (VERSION 2.6 FATAL_ERROR) set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Final" CACHE STRING "possible configurations" FORCE) +list(FIND CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" BuildTypeCurr) +if ("${BuildTypeCurr}" LESS "0") + set(CMAKE_BUILD_TYPE "Final" CACHE STRING "Build type defaults to Final" FORCE) +endif() +unset(BuildTypeCurr) set_property (GLOBAL PROPERTY DEBUG_CONFIGURATIONS "Debug;Release") project (WordReference CXX) @@ -15,15 +20,29 @@ string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) set (${PROJECT_NAME}_SourceCodeVar "\"\$${PROJECT_NAME_UPPER}_SOURCE_PATH\"") find_package(CURL REQUIRED) +find_package(Boost 1.32.0 REQUIRED program_options) -#System inclusion paths +set (GNU_COMMON_C_FLAGS "-Werror -msse2") +set (GNU_COMMON_CXX_FLAGS "-std=c++11 -Werror -msse2 -fexceptions") +foreach (ConfigType ${CMAKE_CONFIGURATION_TYPES}) + string(TOUPPER ${ConfigType} ConfigTypeUpper) + set(CMAKE_CXX_FLAGS_${ConfigTypeUpper} "${CMAKE_CXX_FLAGS_${ConfigTypeUpper}} ${GNU_COMMON_CXX_FLAGS} -DDUCK_${ConfigTypeUpper}") + set(CMAKE_C_FLAGS_${ConfigTypeUpper} "${CMAKE_C_FLAGS_${ConfigTypeUpper}} ${GNU_COMMON_C_FLAGS} -DDUCK_${ConfigTypeUpper}") +endforeach() + +add_definitions(-DJSON_ISO_STRICT) include_directories(SYSTEM ${CURL_INCLUDE_DIRS} + ${LIBJSON_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ) include_directories( . ) -link_directories("${LIBJSON_LIB_DIR}") +link_directories( + ${LIBJSON_LIB_DIR} + ${Boost_LIBRARY_DIRS} +) add_custom_target(build_json ALL COMMAND ${CMAKE_MAKE_PROGRAM} @@ -40,6 +59,7 @@ add_executable(${PROJECT_NAME} main.cpp ) target_link_libraries(${PROJECT_NAME} - "${CURL_LIBRARIES}" + ${Boost_LIBRARIES} + ${CURL_LIBRARIES} json )