-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update main branch for use of simulator
- Loading branch information
Showing
2,485 changed files
with
14,500 additions
and
22,246 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,28 @@ | ||
cmake_minimum_required(VERSION 2.8.11) | ||
project(PARTICLE_FILTER) | ||
|
||
cmake_minimum_required (VERSION 3.5) | ||
|
||
# Build the particle filter project and solution. | ||
# Use C++11 | ||
set(SRCS src/main.cpp src/particle_filter.cpp) | ||
set_source_files_properties(${SRCS} PROPERTIES COMPILE_FLAGS -std=c++0x) | ||
add_definitions(-std=c++11) | ||
|
||
# Create the executable | ||
add_executable(particle_filter ${SRCS}) | ||
set(CXX_FLAGS "-Wall") | ||
set(CMAKE_CXX_FLAGS "${CXX_FLAGS}") | ||
|
||
# Use C++11 | ||
#if [ ! -f ./src/particle_filter_sol.cpp]; then | ||
# echo "No solution file." | ||
#else | ||
# echo "Solution file exists" | ||
#fi | ||
|
||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/particle_filter_sol.cpp") | ||
set(SRCS src/main.cpp src/particle_filter_sol.cpp) | ||
set_source_files_properties(${SRCS} PROPERTIES COMPILE_FLAGS -std=c++0x) | ||
|
||
# Create the executable | ||
add_executable(particle_filter_solution ${SRCS}) | ||
endif() | ||
set(sources src/particle_filter.cpp src/main.cpp) | ||
|
||
|
||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | ||
|
||
include_directories(/usr/local/include) | ||
include_directories(/usr/local/opt/openssl/include) | ||
link_directories(/usr/local/lib) | ||
link_directories(/usr/local/opt/openssl/lib) | ||
link_directories(/usr/local/Cellar/libuv/1*/lib) | ||
|
||
endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | ||
|
||
|
||
add_executable(particle_filter ${sources}) | ||
|
||
|
||
target_link_libraries(particle_filter z ssl uv uWS) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file renamed
BIN
+4.2 KB
...les/3.8.1/CMakeDetermineCompilerABI_C.bin → ...es/3.10.2/CMakeDetermineCompilerABI_C.bin
Binary file not shown.
Binary file renamed
BIN
+4.19 KB
...s/3.8.1/CMakeDetermineCompilerABI_CXX.bin → .../3.10.2/CMakeDetermineCompilerABI_CXX.bin
Binary file not shown.
8 changes: 4 additions & 4 deletions
8
build/CMakeFiles/3.8.1/CMakeSystem.cmake → build/CMakeFiles/3.10.2/CMakeSystem.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file renamed
BIN
+8.41 KB
build/CMakeFiles/3.8.1/CompilerIdC/a.out → build/CMakeFiles/3.10.2/CompilerIdC/a.out
Binary file not shown.
Oops, something went wrong.