Use cmake subdir for test (#13)

* Use CMake subdirectory for test

Use CMake's subdirectory support for tests.
Remove redundant CMake lines in the parent and subdirectory.

* Remove unneeded call to make test

Now with the subdirectory structure one "make test" works.

Author: snoe925

CMakeLists.txt

@@ -64,6 +64,4 @@ install(TARGETS cpptcl_static ARCHIVE DESTINATION lib)
 install(FILES ${HDRS} DESTINATION include/cpptcl)
 install(FILES ${HDRS_DETAILS} DESTINATION include/cpptcl/details)
 
-add_executable(cpptcl_test test/test_main.cc)
-add_test(test1 cpptcl_test)
-target_link_libraries(cpptcl_test PUBLIC cpptcl ${TCL_LIBRARY} ${TCL_STUB_LIBRARY})
+add_subdirectory(test)

COMMONmakefile

@@ -18,7 +18,6 @@ install: all
 
 test: all
 	(cd build; make test)
-	(cd test; make test)
 
 MODULE_SRCS = modules/example_functions/cpptcl_example_functions.cc
 

test/CMakeLists.txt

@@ -1,45 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 
-if (NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") 
-    set(CMAKE_CXX_COMPILER clang++)
-endif()
-
-project(cpptcl_test)
-
-set(TCLSH_VERSION_STRING, "8.6")
-
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    list(APPEND OPTS -stdlib=libc++)
-    list(APPEND OPTS -Wno-reserved-id-macro)
-    list(APPEND OPTS -Wno-padded)
-    list(APPEND OPTS -Wno-c++98-compat)
-endif()
-
-include (CTest)
-
-find_path(TCL_INCLUDE_PATH tcl.h PATHS /usr/local/include/tcl8.6 /usr/include/tcl8.6 NO_DEFAULT_PATH)
-find_library(TCL_LIBRARY NAMES tcl8.6 tcl86 PATHS /usr/local/lib /usr/lib)
-find_library(TCL_STUB_LIBRARY NAMES tclstub8.6 tclstub86 PATHS /usr/local/lib /usr/lib)
-
-message(INFO " Tcl include ${TCL_INCLUDE_PATH}")
-message(INFO " Tcl library ${TCL_LIBRARY}")
-message(INFO " Tcl stub library ${TCL_STUB_LIBRARY}")
-
-if(NOT TCL_LIBRARY)
-  message(FATAL_ERROR " Tcl library not found")
-endif()
-
-#set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_BUILD_TYPE Release)
-
-include_directories(${CMAKE_SOURCE_DIR}/.. ${TCL_INCLUDE_PATH})
-
-add_compile_options(${OPTS})
-
 add_executable(test1 test1.cc ../cpptcl.cc)
 add_test(test1 test1)
 target_link_libraries(test1 PUBLIC ${TCL_LIBRARY} ${TCL_STUB_LIBRARY})
@@ -71,5 +31,5 @@ target_link_libraries(test_main PUBLIC ${TCL_LIBRARY} ${TCL_STUB_LIBRARY})
 set(TCL_TCLSH tclsh8.6)
 add_library(test2 SHARED test2.cc ../cpptcl.cc)
 target_link_libraries(test2 PUBLIC ${TCL_LIBRARY} ${TCL_STUB_LIBRARY})
-add_test(NAME test2 COMMAND ${TCL_TCLSH} ../test2.tcl)
+add_test(NAME test2 COMMAND ${TCL_TCLSH} ${CMAKE_SOURCE_DIR}/test/test2.tcl)