Changeset 459 for branches


Ignore:
Timestamp:
03/14/14 03:13:47 (6 years ago)
Author:
jls17
Message:
  • added gtest directly for offline builds
  • compatibility with vs2012
Location:
branches/work_304
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/work_304/CMakeLists.txt

    r458 r459  
    309309) 
    310310 
     311ADD_CUSTOM_TARGET(gtestzippedsource ALL 
     312        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gtest-1.6.0.zip ${CMAKE_BINARY_DIR}/thirdparty/src/ 
     313) 
     314 
    311315ADD_MSVC_PRECOMPILED_HEADER("stdafx.h" "stdafx.cpp" ARINSIDE_SRCS) 
    312316 
     
    328332ExternalProject_Add( 
    329333        googletest 
    330         URL http://googletest.googlecode.com/files/gtest-1.6.0.zip 
     334        DEPENDS gtestzippedsource 
     335        URL gtest-1.6.0.zip 
    331336        TIMEOUT 10 
    332337        # Force separate output paths for debug and release builds to allow easy 
     
    350355ENABLE_TESTING() 
    351356 
     357# Add compiler flag for MSVC 2012 
     358if(MSVC_VERSION EQUAL 1700) 
     359  add_definitions(-D_VARIADIC_MAX=10) 
     360endif() 
     361 
    352362LINK_DIRECTORIES(${GTEST_BINARY_DIR}) 
    353363 
  • branches/work_304/COPYING

    r313 r459  
    4949== rapidjson == 
    5050Homepage: http://code.google.com/p/rapidjson/ 
    51 License:  MIT (see thirdparty/rapidjson/license.txt 
     51License:  MIT (see thirdparty/rapidjson/license.txt) 
    5252 
    5353rapidjson is a fast JSON parser/generator for C++ with both SAX/DOM style API 
     54 
     55== googletest == 
     56Homepage: https://code.google.com/p/googletest/ 
     57License:  New BSD License (http://opensource.org/licenses/BSD-3-Clause) 
     58 
     59googletest is framework for writing C++ tests on a variety of platforms. 
     60 
     61== JQuery & JQueryUI == 
     62Homepage: https://jquery.org/  ||  http://jqueryui.com/ 
     63License:  MIT (https://jquery.org/license/) 
     64 
     65jQuery is a fast, small, and feature-rich JavaScript library. jQuery UI is a  
     66curated set of user interface interactions, effects, widgets, and themes built 
     67on top of the jQuery JavaScript Library. 
  • branches/work_304/stdafx.h

    r326 r459  
    3030#include <iterator> 
    3131#include <algorithm> 
     32#include <functional> 
    3233#include <assert.h> 
    3334 
Note: See TracChangeset for help on using the changeset viewer.