NerfUS
Dependencies: mbed mbed-rtos HardwareInterface EthernetInterface WebSocketClient
Revision 8:0498fa4f5c1f, committed 2017-02-09
- Comitter:
- Maxime Dupuis
- Date:
- Thu Feb 09 14:24:39 2017 -0500
- Parent:
- 7:e5414568de93
- Child:
- 9:4731e16b1359
- Commit message:
- Simplify the build process
Changed in this revision
--- a/CMakeLists.txt Thu Feb 09 02:01:51 2017 +0000 +++ b/CMakeLists.txt Thu Feb 09 14:24:39 2017 -0500 @@ -1,43 +1,11 @@ cmake_minimum_required(VERSION 3.5) -project(NerfUS) -# Download and unpack googletest at configure time -configure_file(CMakeLists.txt.in - googletest-download/CMakeLists.txt) -execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) -execute_process(COMMAND ${CMAKE_COMMAND} --build . - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) - -# Prevent GoogleTest from overriding our compiler/linker options -# when building with Visual Studio -set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - -# Add googletest directly to our build. This adds -# the following targets: gtest, gtest_main, gmock -# and gmock_main -add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src - ${CMAKE_BINARY_DIR}/googletest-build) - -# The gtest/gmock targets carry header search path -# dependencies automatically when using CMake 2.8.11 or -# later. Otherwise we have to add them here ourselves. -if (CMAKE_VERSION VERSION_LESS 2.8.11) - include_directories("${gtest_SOURCE_DIR}/include" - "${gmock_SOURCE_DIR}/include") -endif() - -# Now simply link your own targets against gtest, gmock, -# etc. as appropriate +include("GoogleTest.cmake") + include_directories(include) -include_directories("${gtest_SOURCE_DIR}/include") - -# Where Google Test's libraries can be found. -#link_directories("./googletest-build/googlemock/gtest/libgtest.a") file(GLOB SOURCES "source/*.cpp") file(GLOB TEST_SOURCES "TESTS/*.cpp") add_executable(run_unit_tests ${SOURCES} ${TEST_SOURCES}) - -target_link_libraries(run_unit_tests gtest gmock gmock_main) +target_link_libraries(run_unit_tests gmock_main)
--- a/CMakeLists.txt.in Thu Feb 09 02:01:51 2017 +0000 +++ b/CMakeLists.txt.in Thu Feb 09 14:24:39 2017 -0500 @@ -1,15 +1,10 @@ -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.5) project(googletest-download NONE) include(ExternalProject) ExternalProject_Add(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG master SOURCE_DIR "${CMAKE_BINARY_DIR}/googletest-src" BINARY_DIR "${CMAKE_BINARY_DIR}/googletest-build" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/GoogleTest.cmake Thu Feb 09 14:24:39 2017 -0500 @@ -0,0 +1,17 @@ +cmake_minimum_required(VERSION 3.5) + +# Download and unpack googletest at configure time +configure_file(CMakeLists.txt.in + googletest-download/CMakeLists.txt) + +execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) +execute_process(COMMAND ${CMAKE_COMMAND} --build . + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + +# Add googletest directly to our build. This adds the following targets: gtest, gtest_main, gmock and gmock_main +add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src + ${CMAKE_BINARY_DIR}/googletest-build) + +include_directories("${gtest_SOURCE_DIR}/include") +