More cleanup

This commit is contained in:
Jared Szechy 2015-08-06 12:34:56 -04:00
parent 6605925162
commit 9eaaa323fe
4 changed files with 3 additions and 8 deletions

View File

@ -1,7 +1,7 @@
project(dsd)
cmake_minimum_required(VERSION 2.6)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${dsd_SOURCE_DIR}/cmake/")
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
include(git_revision)
git_describe(GIT_TAG)
@ -39,7 +39,7 @@ install(TARGETS dsd DESTINATION bin)
# uninstall target
configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY)

3
configure vendored
View File

@ -1,3 +0,0 @@
#!/bin/sh
echo "There is no configure script, just run make"

View File

@ -3,13 +3,11 @@ project(dsdtest)
add_subdirectory(gtest)
add_subdirectory(gmock)
FILE(GLOB SRCS *.cpp ${dsdtest_SOURCE_DIR}/../src/Hamming.cpp)
FILE(GLOB SRCS *.cpp ${dsd_SOURCE_DIR}/src/Hamming.cpp)
include_directories(
${PROJECT_SOURCE_DIR}/gtest/include
${PROJECT_SOURCE_DIR}/gmock/include
${dsdtest_SOURCE_DIR}
${dsdtest_SOURCE_DIR}/..
)
add_custom_target(test