Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,28 @@ endif ()

cmake_minimum_required(VERSION 3.12)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
find_program(GXX_COMPILER NAMES g++)

if(GXX_COMPILER)
message(STATUS "Found g++: ${GXX_COMPILER}")
set(CMAKE_CXX_COMPILER ${GXX_COMPILER})
else()
message(FATAL_ERROR "g++ compiler not found. Please install g++ and try again.")
endif()

project(camera)

set(CMAKE_GXX_STANDARD 17)
set(CMAKE_GXX_STANDARD_REQUIRED ON)
set(CMAKE_GXX_EXTENSIONS OFF)

# Run "cmake .." from the project's build/ directory!
#
set(PROJECT_BASE_DIR $ENV{PWD}/../)

set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BASE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_BASE_DIR}/lib)
set(CMAKE_C_COMPILER /usr/bin/g++)
set(CMAKE_CXX_COMPILER /usr/bin/g++)


if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
include_directories(/usr/local/include)
Expand Down
2 changes: 0 additions & 2 deletions common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ set(PROJECT_UTILS_DIR ${PROJECT_BASE_DIR}/common)
include_directories(${PROJECT_BASE_DIR}/common)
include_directories(${PROJECT_BASE_DIR}/utils) # needed for logentry

add_definitions(-Wall -ansi -O2 -Wno-variadic-macros -std=c++17 -ggdb)

add_library(common STATIC
${PROJECT_UTILS_DIR}/common.cpp
)
2 changes: 0 additions & 2 deletions emulator/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ include_directories( ${PROJECT_BASE_DIR}/utils
${PROJECT_BASE_DIR}/camerad
${PROJECT_BASE_DIR}/common )

add_definitions( -Wall -ansi -O1 -Wno-variadic-macros -std=c++17 -ggdb )

if( ${INTERFACE_TYPE} STREQUAL "Archon" )
add_definitions(-DSTA_ARCHON)
set( EMULATOR_TARGET emulatorArchon )
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12)
set(PROJECT_TESTS_DIR ${PROJECT_BASE_DIR}/tests)

# Find the Google Test library
find_package(GTest REQUIRED)
find_package(GTest)

add_executable(
run_unit_tests utility_tests.cpp) # List all unit test source files here
Expand Down
10 changes: 3 additions & 7 deletions utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ cmake_minimum_required(VERSION 3.12)

set(PROJECT_UTILS_DIR ${PROJECT_BASE_DIR}/utils)

set(CMAKE_CXX_STANDARD 17)

add_definitions(-Wall -ansi -O1 -Wno-variadic-macros -std=c++17 -ggdb)

add_library(utilities STATIC
${PROJECT_UTILS_DIR}/utilities.cpp
md5
Expand All @@ -24,13 +20,13 @@ add_library(network STATIC
)

add_library(md5 STATIC
${PROJECT_UTILS_DIR}/md5.c
${PROJECT_UTILS_DIR}/md5.cpp
)

add_executable(listener
${PROJECT_UTILS_DIR}/listener.c
${PROJECT_UTILS_DIR}/listener.cpp
)

add_executable(socksend
${PROJECT_UTILS_DIR}/sendcmd.c
${PROJECT_UTILS_DIR}/sendcmd.cpp
)
2 changes: 1 addition & 1 deletion utils/listener.c → utils/listener.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Simple listener.c program for UDP multicast
// Simple listener.cpp program for UDP multicast
//
// Adapted from:
// http://ntrg.cs.tcd.ie/undergrad/4ba2/multicast/antony/example.html
Expand Down
2 changes: 1 addition & 1 deletion utils/md5.c → utils/md5.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*********************************************************************
* Filename: md5.c
* Filename: md5.cpp
* Author: Brad Conte (brad AT bradconte.com)
* Copyright:
* Disclaimer: This code is presented "as is" without any guarantees.
Expand Down
2 changes: 1 addition & 1 deletion utils/sendcmd.c → utils/sendcmd.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* client.c */

#include <fcntl.h>
#include <sys/time.h>
#include<sys/socket.h>
Expand Down
2 changes: 1 addition & 1 deletion utils/utilities.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ int compare_versions(const std::string &v1, const std::string &v2) {
/***** md5_file *************************************************************/
/**
* @brief compute the md5sum of a file
* @details This makes use of an external source, md5.h and md5.c
* @details This makes use of an external source, md5.h and md5.cpp
* @param[in] filename const reference to filename to process
* @param[out] hash reference to a string to contain result
*
Expand Down