Skip to content

Commit

Permalink
* externalize mocha and chai -> cascara
Browse files Browse the repository at this point in the history
  • Loading branch information
mabels committed Oct 17, 2016
1 parent 186c639 commit 5125518
Show file tree
Hide file tree
Showing 17 changed files with 467 additions and 629 deletions.
23 changes: 23 additions & 0 deletions cpp/CMakeLists-cascara.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
include(ExternalProject)
ExternalProject_Add(
cascara

GIT_REPOSITORY "${GITBASE}/mabels/cascara"
GIT_TAG "master"

UPDATE_COMMAND ""

SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/cascara"
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF -DARCHIVE_INSTALL_DIR=<INSTALL_DIR> -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> ../..

#BUILD_COMMAND ""
#INSTALL_COMMAND ""
TEST_COMMAND ""
)

ExternalProject_Get_Property(cascara install_dir)
include_directories(${install_dir}/include)


set(cascara_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/3rdparty/cascara/include")
include_directories(${cascara_INCLUDE_DIRS})
9 changes: 8 additions & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ endif()
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -g")

if(NOT GITBASE)
set(GITBASE https://github.com)
endif()


#Only tested with versions 1.55 and 1.56
find_package(Boost 1.54.0 COMPONENTS system regex coroutine context thread iostreams REQUIRED)
find_package(Boost 1.54.0 COMPONENTS system regex REQUIRED)
include_directories(${Boost_INCLUDE_DIR})

if(APPLE)
Expand All @@ -25,6 +29,9 @@ endif()

#include(CMakeLists-easyloggingpp.txt)

include(CMakeLists-cascara.txt)


#set(SIMPLEWEB_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/Simple-WebSocket-Server")
#TODO: add requirement for version 1.0.1g (can it be done in one line?)
#find_package(OpenSSL REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion cpp/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -g")

enable_testing()

find_package(Boost 1.54.0 COMPONENTS system coroutine context iostreams thread regex REQUIRED)
find_package(Boost 1.54.0 COMPONENTS system regex REQUIRED)
include_directories(${Boost_INCLUDE_DIR})

find_package(Threads REQUIRED)
Expand Down
140 changes: 0 additions & 140 deletions cpp/test/chai.hpp

This file was deleted.

63 changes: 0 additions & 63 deletions cpp/test/mocha.hpp

This file was deleted.

Loading

0 comments on commit 5125518

Please sign in to comment.