Преглед на файлове

fixed: copy header AND template files to output directory, install them into correct sub-library include path (also applicable by other sub-libraries)

Johannes Ruehle преди 11 години
родител
ревизия
0d81117ec7
променени са 2 файла, в които са добавени 5 реда и са изтрити 3 реда
  1. 5 0
      cmake/NiceModules.cmake
  2. 0 3
      core/CMakeLists.txt

+ 5 - 0
cmake/NiceModules.cmake

@@ -127,6 +127,11 @@ macro(nice_build_library)
   SET_PROPERTY(TARGET "nice_${the_library}" PROPERTY FOLDER "library")
   INSTALL(TARGETS "nice_${the_library}" DESTINATION lib)
 
+  install(DIRECTORY ./ DESTINATION "include/${the_library}"
+          FILES_MATCHING 
+          PATTERN "*.h"
+          PATTERN "*.tcc")
+
   configure_file( ../cmake/niceConfig.cmake.in "${PROJECT_BINARY_DIR}/lib/nice_${the_library}Config.cmake" )
 endmacro()
 

+ 0 - 3
core/CMakeLists.txt

@@ -56,9 +56,6 @@ nice_add_unittests()
     ARCHIVE DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main
     )
 
-  install(DIRECTORY ./ DESTINATION include
-    FILES_MATCHING PATTERN "*.h")
- 
 #   # only "public" headers need to be installed
 #   if(OPENCV_MODULE_${the_module}_HEADERS AND ";${OPENCV_MODULES_PUBLIC};" MATCHES ";${the_module};")
 #     foreach(hdr ${OPENCV_MODULE_${the_module}_HEADERS})