Commit 9f463340 authored by Brian Panneton's avatar Brian Panneton
Browse files

ENH: Cleaned up some of the CMakeLists.txt file

parent d7e90ba1
project(Xdmf) project(Xdmf)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
enable_testing()
include(CTest)
set(BUILD_SHARED_LIBS true) set(BUILD_SHARED_LIBS true)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
SET(CMAKE_SKIP_BUILD_RPATH FALSE) SET(CMAKE_SKIP_BUILD_RPATH FALSE)
...@@ -23,6 +20,12 @@ if(XDMF_BUILD_DOCUMENTATION) ...@@ -23,6 +20,12 @@ if(XDMF_BUILD_DOCUMENTATION)
add_subdirectory(doc) add_subdirectory(doc)
endif(XDMF_BUILD_DOCUMENTATION) endif(XDMF_BUILD_DOCUMENTATION)
option(XDMF_BUILD_TESTING ON)
if(XDMF_BUILD_TESTING)
enable_testing()
include(CTest)
endif(XDMF_BUILD_TESTING)
# Wrapper Setup # Wrapper Setup
option(XDMF_WRAP_PYTHON OFF) option(XDMF_WRAP_PYTHON OFF)
option(XDMF_WRAP_JAVA OFF) option(XDMF_WRAP_JAVA OFF)
...@@ -159,7 +162,6 @@ if(NOT XDMF_BUILD_CORE_ONLY) ...@@ -159,7 +162,6 @@ if(NOT XDMF_BUILD_CORE_ONLY)
endif(XDMF_WRAP_PYTHON) endif(XDMF_WRAP_PYTHON)
if(BUILD_TESTING) if(BUILD_TESTING)
include_directories(tests/Cxx)
add_subdirectory(tests) add_subdirectory(tests)
endif(BUILD_TESTING) endif(BUILD_TESTING)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment