diff --git a/.gitignore b/.gitignore index 52540e7..02d709a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ CMakeCache.txt CMakeFiles Makefile +CTestTestfile.cmake cmake_install.cmake install_manifest.txt +*.a diff --git a/CMakeLists.txt b/CMakeLists.txt index 1384fc8..b99640a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 2.8) -project(libr3) +project(r3) SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules @@ -34,7 +34,7 @@ link_directories(${LINK_DIRECTORIES} /opt/local/lib) find_package(PCRE REQUIRED) find_package(Judy REQUIRED) -set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} libr3) +set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} r3) # find_package(opencv) @@ -49,7 +49,7 @@ enable_testing() add_subdirectory(tests) add_test(test_tree ${CMAKE_CURRENT_BINARY_DIR}/test_tree) -add_library(libr3 main.c) +add_library(r3 main.c) # add_executable(alphablue-gui main.cc cv.cc) # target_link_libraries(alphablue-gui ${OpenCV_LIBS} ${GFlags_LIBS} ${GLog_LIBS} ${Boost_LIBS}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 82dc2d0..e5107c3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(Judy REQUIRED) if (NOT CHECK_FOUND) message(STATUS "Skipping unit tests, Check library not found!") else (NOT CHECK_FOUND) - set(TEST_LIBS ${LIBS} ${CHECK_LIBRARIES} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} libr3) + set(TEST_LIBS ${LIBS} ${CHECK_LIBRARIES} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} r3) include_directories(${CHECK_INCLUDE_DIRS}) # include_directories("${PROJECT_SOURCE_DIR}/include/r2")