mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-20 12:45:40 -05:00
More cleanup
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
project(dsd)
|
project(dsd)
|
||||||
cmake_minimum_required(VERSION 2.6)
|
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)
|
include(git_revision)
|
||||||
git_describe(GIT_TAG)
|
git_describe(GIT_TAG)
|
||||||
@@ -39,7 +39,7 @@ install(TARGETS dsd DESTINATION bin)
|
|||||||
|
|
||||||
# uninstall target
|
# uninstall target
|
||||||
configure_file(
|
configure_file(
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
|
"cmake/cmake_uninstall.cmake.in"
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
|
||||||
IMMEDIATE @ONLY)
|
IMMEDIATE @ONLY)
|
||||||
|
|
||||||
|
|||||||
3
configure
vendored
3
configure
vendored
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo "There is no configure script, just run make"
|
|
||||||
@@ -3,13 +3,11 @@ project(dsdtest)
|
|||||||
add_subdirectory(gtest)
|
add_subdirectory(gtest)
|
||||||
add_subdirectory(gmock)
|
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(
|
include_directories(
|
||||||
${PROJECT_SOURCE_DIR}/gtest/include
|
${PROJECT_SOURCE_DIR}/gtest/include
|
||||||
${PROJECT_SOURCE_DIR}/gmock/include
|
${PROJECT_SOURCE_DIR}/gmock/include
|
||||||
${dsdtest_SOURCE_DIR}
|
|
||||||
${dsdtest_SOURCE_DIR}/..
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_custom_target(test
|
add_custom_target(test
|
||||||
|
|||||||
Reference in New Issue
Block a user