Skip to content

Commit f2ae3f1

Browse files
committed
removed dependencies for CMake
1 parent 962310b commit f2ae3f1

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
.DS_Store
12
/build
23
/dist
34
/*.egg-info
4-
5-
.DS_Store
5+
/python/build
6+
/python/files.txt

.gitmodules

+1-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
url = https://github.com/jermp/essentials.git
77
[submodule "external/cmd_line_parser"]
88
path = external/cmd_line_parser
9-
url = https://github.com/jermp/cmd_line_parser.git
10-
[submodule "cmake/thirdParty/Boilerplate"]
11-
path = cmake/thirdParty/Boilerplate
12-
url = https://github.com/KOLANICH-libs/Boilerplate.cmake
9+
url = https://github.com/jermp/cmd_line_parser.git

CMakeLists.txt

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
cmake_minimum_required(VERSION 2.8)
22
project(TONGRAMS)
33

4-
set(OUR_CMAKE_MODULES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
5-
set(OUR_CMAKE_3PARTY_MODULES_DIR "${OUR_CMAKE_MODULES_DIR}/thirdParty")
6-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OUR_CMAKE_MODULES_DIR}" "${OUR_CMAKE_3PARTY_MODULES_DIR}" "${OUR_CMAKE_3PARTY_MODULES_DIR}/Boilerplate" "${OUR_CMAKE_3PARTY_MODULES_DIR}/DoxygenUtils")
7-
8-
include(Boilerplate)
9-
104
if(CMAKE_BUILD_TYPE MATCHES Debug)
115
MESSAGE(STATUS "DEBUG defined")
126
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG")
@@ -35,11 +29,19 @@ if(TONGRAMS_USE_PDEP)
3529
endif()
3630
endif()
3731

32+
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
33+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
34+
endif ()
35+
3836
if (UNIX)
37+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
38+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
3939
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
40+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
41+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-missing-braces")
4042

4143
if(TONGRAMS_USE_SANITIZERS)
42-
set(SANITIZE_ADDRESS ON)
44+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
4345
endif()
4446

4547
endif()
@@ -56,16 +58,12 @@ file(GLOB SRC_SOURCES src/*.cpp)
5658
foreach(SRC ${SRC_SOURCES})
5759
get_filename_component (SRC_NAME ${SRC} NAME_WE) # without extension
5860
add_executable(${SRC_NAME} ${SRC})
59-
add_sanitizers(${SRC_NAME})
60-
harden(${SRC_NAME})
6161
target_link_libraries(${SRC_NAME} ${Boost_LIBRARIES})
6262
endforeach(SRC)
6363

6464
file(GLOB TEST_SOURCES test/test_*.cpp)
6565
foreach(TEST_SRC ${TEST_SOURCES})
6666
get_filename_component (TEST_SRC_NAME ${TEST_SRC} NAME_WE) # without extension
6767
add_executable(${TEST_SRC_NAME} ${TEST_SRC})
68-
add_sanitizers(${TEST_SRC_NAME})
69-
harden(${TEST_SRC_NAME})
7068
target_link_libraries(${TEST_SRC_NAME} ${Boost_LIBRARIES})
7169
endforeach(TEST_SRC)

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright 2017-2019 Giulio Ermanno Pibiri
3+
Copyright 2017-2021 Giulio Ermanno Pibiri
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

cmake/thirdParty/Boilerplate

-1
This file was deleted.

0 commit comments

Comments
 (0)