Commit 00ff7810 authored by Patrik Huber's avatar Patrik Huber

Removed all non-header-only CMake stuff and added a custom target for the...

Removed all non-header-only CMake stuff and added a custom target for the library headers so they show up in IDEs
parent 99152f22
...@@ -27,9 +27,6 @@ set(CPACK_PACKAGE_VERSION_MINOR "${eos_VERSION_MINOR}") ...@@ -27,9 +27,6 @@ set(CPACK_PACKAGE_VERSION_MINOR "${eos_VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${eos_VERSION_PATCH}") set(CPACK_PACKAGE_VERSION_PATCH "${eos_VERSION_PATCH}")
include(CPack) include(CPack)
# Set debug library postfix:
set(CMAKE_DEBUG_POSTFIX "-d")
# Find dependencies: # Find dependencies:
find_package(OpenCV 2.4.3 REQUIRED core) find_package(OpenCV 2.4.3 REQUIRED core)
message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}") message(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
...@@ -42,8 +39,8 @@ else(Boost_FOUND) ...@@ -42,8 +39,8 @@ else(Boost_FOUND)
message(FATAL_ERROR "Boost not found") message(FATAL_ERROR "Boost not found")
endif() endif()
# Header files:
# Header files:
set(HEADERS set(HEADERS
include/eos/core/LandmarkMapper.hpp include/eos/core/LandmarkMapper.hpp
include/eos/morphablemodel/PcaModel.hpp include/eos/morphablemodel/PcaModel.hpp
...@@ -60,21 +57,13 @@ include_directories("include") ...@@ -60,21 +57,13 @@ include_directories("include")
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
include_directories(${OpenCV_INCLUDE_DIRS}) include_directories(${OpenCV_INCLUDE_DIRS})
# Make the library: # Custom target for the library, to make the headers show up in IDEs:
add_library(eos ${SOURCES} ${HEADERS}) add_custom_target(eos SOURCES ${HEADERS})
target_link_libraries(eos ${OpenCV_LIBS} ${Boost_LIBRARIES})
# The install target: # The install target:
install(TARGETS eos DESTINATION ${CMAKE_INSTALL_PREFIX}/lib EXPORT eos-targets)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share) install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share)
# Export the target:
install(EXPORT eos-targets DESTINATION ${CMAKE_INSTALL_PREFIX}/) # creates eos-targets.cmake
install(FILES eos-config.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/)
configure_file(eos-config-version.cmake.in "${PROJECT_BINARY_DIR}/eos-config-version.cmake" @ONLY)
install(FILES "${PROJECT_BINARY_DIR}/eos-config-version.cmake" DESTINATION ${CMAKE_INSTALL_PREFIX}/)
if(BUILD_EXAMPLES) if(BUILD_EXAMPLES)
add_subdirectory(examples) add_subdirectory(examples)
endif() endif()
......
...@@ -15,7 +15,7 @@ endif() ...@@ -15,7 +15,7 @@ endif()
# Model fitting (affine cam & shape to landmarks) example: # Model fitting (affine cam & shape to landmarks) example:
add_executable(fit_model fit_model.cpp) add_executable(fit_model fit_model.cpp)
target_link_libraries(fit_model eos ${OpenCV_LIBS} ${Boost_LIBRARIES}) target_link_libraries(fit_model ${OpenCV_LIBS} ${Boost_LIBRARIES})
# TODO Add dependency to library-target?? # TODO Add dependency to library-target??
# install target: # install target:
......
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