Skip to content

Commit dca2b87

Browse files
committed
adjusts CMake configuration and namespace updates
1 parent e1edfc0 commit dca2b87

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
cmake_minimum_required(VERSION 3.10)
2-
project(expression_tree)
2+
project(expression_tree
3+
DESCRIPTION "C++11 expression tree implementation, used for evaluating instances of user-defined types"
4+
VERSION 0.0.1
5+
LANGUAGES CXX)
36

4-
enable_testing()
7+
include(CTest)
8+
9+
if (NOT DEFINED CMAKE_CXX_STANDARD)
10+
set(CMAKE_CXX_STANDARD 11)
11+
endif()
512

613
include_directories( include )
714
add_subdirectory( tests )
File renamed without changes.

tests/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
set(VERSION 0.0.1)
2-
3-
add_executable( expression_tree_test test.cpp )
4-
add_test( expression_tree_test ${EXECUTABLE_OUTPUT_PATH}/expression_tree_test )
1+
if(BUILD_TESTING)
2+
add_executable( expression_tree_test test.cpp )
3+
add_test( expression_tree_test ${EXECUTABLE_OUTPUT_PATH}/expression_tree_test )
4+
endif()

tests/test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <expression_tree/expression_tree.hpp>
1+
#include <attwoodn/expression_tree.hpp>
22

33
int main(int argc, char** argv) {
44
attwoodn::expression_tree::say_hello();

0 commit comments

Comments
 (0)