]> rtime.felk.cvut.cz Git - opencv.git/commitdiff
excluded some obsolete files from the generated packages
authorvp153 <vp153@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Sat, 2 Jan 2010 14:03:05 +0000 (14:03 +0000)
committervp153 <vp153@73c94f0f-984f-4a5f-82bc-2d8db8d8ee08>
Sat, 2 Jan 2010 14:03:05 +0000 (14:03 +0000)
git-svn-id: https://code.ros.org/svn/opencv/trunk@2529 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

opencv/CMakeLists.txt

index 3bf8d50f9d25e69775d4f837d09d872b170afc69..ea58843924eef6f04f5530719a2ead7aaccf3c50 100644 (file)
@@ -77,17 +77,17 @@ else()
     set(OPENCV_DEBUG_POSTFIX)\r
 endif()\r
 \r
-
+\r
 # ----------------------------------------------------------------------------\r
-# Build static or dynamic libs?
+# Build static or dynamic libs?\r
 # ----------------------------------------------------------------------------\r
-# Default: dynamic libraries:
-SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
-IF(BUILD_SHARED_LIBS)
-       SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
-ELSE(BUILD_SHARED_LIBS)
-       SET(OPENCV_BUILD_SHARED_LIB 0)
-ENDIF(BUILD_SHARED_LIBS)
+# Default: dynamic libraries:\r
+SET(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")\r
+IF(BUILD_SHARED_LIBS)\r
+       SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.\r
+ELSE(BUILD_SHARED_LIBS)\r
+       SET(OPENCV_BUILD_SHARED_LIB 0)\r
+ENDIF(BUILD_SHARED_LIBS)\r
 \r
 # ----------------------------------------------------------------------------\r
 #  Variables for cvconfig.h.cmake\r
@@ -142,7 +142,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_OPENCV_GCC_VERSION ${CMAKE_OPENCV_GCC_VERSION_MAJOR}${CMAKE_OPENCV_GCC_VERSION_MINOR})\r
     message(STATUS "Detected version of GNU GCC: ${CMAKE_OPENCV_GCC_VERSION}")\r
 endif()\r
-
+\r
 # ----------------------------------------------------------------------------\r
 #       CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..\r
 # ----------------------------------------------------------------------------\r
@@ -658,15 +658,15 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 \r
     set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG")\r
     set(EXTRA_C_FLAGS_DEBUG "${EXTRA_C_FLAGS_DEBUG} -O0 -DDEBUG -D_DEBUG")\r
-endif()
-
-# Extra link libs if the user selects building static libs:
-IF(NOT BUILD_SHARED_LIBS)
+endif()\r
+\r
+# Extra link libs if the user selects building static libs:\r
+IF(NOT BUILD_SHARED_LIBS)\r
        if(CMAKE_COMPILER_IS_GNUCXX)\r
-               set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)
+               set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++)\r
        endif()\r
-
-       set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)
+\r
+       set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack)\r
 endif()\r
 \r
 \r
@@ -740,7 +740,7 @@ endif()
 \r
 # Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:\r
 set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"${OPENCV_CONFIG_FILE_INCLUDE_DIR}\" \"${CMAKE_CURRENT_SOURCE_DIR}/include\" \"${CMAKE_CURRENT_SOURCE_DIR}/include/opencv\"")\r
-
+\r
 set(CMAKE_LIB_DIRS_CONFIGCMAKE "${LIBRARY_OUTPUT_PATH}")\r
 \r
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/OpenCVConfig.cmake" IMMEDIATE @ONLY)\r
@@ -828,9 +828,9 @@ if(BUILD_PACKAGE)
     \r
     include(${CMAKE_BINARY_DIR}/.cpack/Package.cmake)\r
 \r
-    set(root_files README ChangeLog configure)\r
+    set(root_files README)\r
 \r
-    file(GLOB root_src_files *.in *.sh *.cmake CMakeLists.txt)\r
+    file(GLOB root_src_files *.in *.cmake CMakeLists.txt)\r
 \r
     if (NOT WIN32)\r
         install(FILES ${root_files}\r