Merge pull request deepinsight#2693 from sam-herman/add-lib-config

fix creation of C++ sample and add library config for makefiles

cpp-package/inspireface/CMakeLists.txt

@@ -19,6 +19,9 @@ string(CONCAT INSPIRE_FACE_VERSION_PATCH_STR ${INSPIRE_FACE_VERSION_PATCH})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/information.h.in ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/information.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/version.txt.in ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inspireface/version.txt)
 
+# Creates a package config file
+configure_file("${InspireFace_SOURCE_DIR}/cpp/inspireface/cmake/templates/InspireFaceConfig.cmake.in" "${CMAKE_BINARY_DIR}/install/InspireFaceConfig.cmake" @ONLY)
+
 # Set the ISF_THIRD_PARTY_DIR variable to allow it to be set externally from the command line, or use the default path if it is not set
 set(ISF_THIRD_PARTY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty" CACHE PATH "Path to the third-party libraries directory")
 

cpp-package/inspireface/cpp/inspireface/cmake/templates/InspireFaceConfig.cmake.in

@@ -0,0 +1,25 @@
+# ===================================================================================
+#  The InspireFace CMake configuration file
+#
+#             ** File generated automatically, do not modify **
+#  Usage from an external project:
+#    In your CMakeLists.txt, add these lines:
+#
+#    find_package(InspireFace REQUIRED)
+#    include_directories(${InspireFace_INCLUDE_DIRS}) # Not needed for CMake >= 2.8.11
+#    target_link_libraries(MY_TARGET_NAME ${InspireFace_LIBS})
+#
+#
+#
+#    This file will define the following variables:
+#      - InspireFace_LIBS                     : The list of all imported targets for InspireFace modules.
+#      - InspireFace_INCLUDE_DIRS             : The InspireFace include directories.
+#
+#
+@PACKAGE_INIT@
+
+set(InspireFace_LIBS "")
+file(GLOB LIBS "@CMAKE_BINARY_DIR@/InspireFace/lib/*.*")
+
+list(APPEND InspireFace_LIBS ${LIBS})
+set(InspireFace_INCLUDE_DIRS "@CMAKE_BINARY_DIR@/InspireFace/include")

cpp-package/inspireface/cpp/sample/CMakeLists.txt

@@ -39,13 +39,13 @@ set_target_properties(MTFaceTrackSample PROPERTIES
 )
 
 if(NOT DISABLE_GUI)
-        # Examples of face detection and tracking
-        add_executable(FaceTrackVideoSample cpp/sample_face_track_video.cpp)
-        target_link_libraries(FaceTrackVideoSample InspireFace ${ext})
-        set_target_properties(FaceTrackVideoSample PROPERTIES
-                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/sample/"
-        )
-endif()
+    # Examples of face detection and tracking
+    add_executable(FaceTrackVideoSample cpp/sample_face_track_video.cpp)
+    target_link_libraries(FaceTrackVideoSample InspireFace ${ext})
+    set_target_properties(FaceTrackVideoSample PROPERTIES
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/sample/"
+    )
+endif ()
 
 
 
@@ -265,4 +265,4 @@ install(TARGETS MTFaceTrackSample RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/sa
 install(TARGETS FaceRecognitionSample RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/sample)
 install(TARGETS FaceSearchSample RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/sample)
 install(TARGETS FaceComparisonSample RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/sample)
-
+install(TARGETS FaceTrackVideoSample RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/sample)