Skip to content

Commit

Permalink
Ups! I forgot to fix the indentation.
Browse files Browse the repository at this point in the history
  • Loading branch information
grendel.ccl committed Jan 26, 2011
1 parent 0679524 commit 4565d48
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
26 changes: 13 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,25 @@ exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cvBlobConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/cvBlobConfig.cmake" IMMEDIATE @ONLY)

if(UNIX)
# For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/FOO/FOOConfig.cmake, so:
install(FILES ${CMAKE_BINARY_DIR}/unix-install/cvBlobConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cvblob/)
# For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/FOO/FOOConfig.cmake, so:
install(FILES ${CMAKE_BINARY_DIR}/unix-install/cvBlobConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cvblob/)
endif()

# --------------------------------------------------------------------------------------------
# Part 3/3: ${BIN_DIR}/win-install/cvBlobConfig.cmake -> For use within binary installers/packages
# -------------------------------------------------------------------------------------------
if(WIN32)
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:
# Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories:

# This will expand to, for example, <program files>/cvBlob 1.1.0/include
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${THIS_CVBLOB_CONFIG_PATH}/include/")
# This will expand to, for example, <program files>/cvBlob 1.1.0/include
set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${THIS_CVBLOB_CONFIG_PATH}/include/")

# This will expand to, for example, <program files>/cvBlob 1.1.0/lib
set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_CVBLOB_CONFIG_PATH}/lib\"")
# This will expand to, for example, <program files>/cvBlob 1.1.0/lib
set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_CVBLOB_CONFIG_PATH}/lib\"")

#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/win-install/\"")
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cvBlobConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/cvBlobConfig.cmake" IMMEDIATE @ONLY)
#exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/win-install/\"")
exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/win-install/\"")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cvBlobConfig.cmake.in" "${CMAKE_BINARY_DIR}/win-install/cvBlobConfig.cmake" IMMEDIATE @ONLY)
endif()
# --------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -132,9 +132,9 @@ set(CPACK_RESOURCE_FILE_README ${cvBlob_SOURCE_DIR}/README)
set(CPACK_SOURCE_PACKAGE_FILE_NAME "cvBlob-src-${CPACK_PACKAGE_VERSION}")
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_IGNORE_FILES
"~$"
"/\\\\.svn/"
# "^${PROJECT_SOURCE_DIR}/old/"
"~$"
"/\\\\.svn/"
# "^${PROJECT_SOURCE_DIR}/old/"
)

include(CPack)
16 changes: 8 additions & 8 deletions cvBlobConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ SET(cvBlob_LIB_DIR "@CMAKE_LIB_DIRS_CONFIGCMAKE@")
set(CVBLOB_LIB_COMPONENTS cvblob)
SET(cvBlob_LIBS "")
foreach(__CVLIB ${CVBLOB_LIB_COMPONENTS})
# CMake>=2.6 supports the notation "debug XXd optimized XX"
if (CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
# Modern CMake:
SET(cvBlob_LIBS ${cvBlob_LIBS} debug ${__CVLIB} @CVBLOB_DLLVERSION@@CVBLOB_DEBUG_POSTFIX@ optimized ${__CVLIB} @CVBLOB_DLLVERSION@)
else(CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
# Old CMake:
SET(cvBlob_LIBS ${cvBlob_LIBS} ${__CVLIB}@CVBLOB_DLLVERSION@)
endif(CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
# CMake>=2.6 supports the notation "debug XXd optimized XX"
if (CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
# Modern CMake:
SET(cvBlob_LIBS ${cvBlob_LIBS} debug ${__CVLIB} @CVBLOB_DLLVERSION@@CVBLOB_DEBUG_POSTFIX@ optimized ${__CVLIB} @CVBLOB_DLLVERSION@)
else(CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
# Old CMake:
SET(cvBlob_LIBS ${cvBlob_LIBS} ${__CVLIB}@CVBLOB_DLLVERSION@)
endif(CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4)
endforeach(__CVLIB)


Expand Down

0 comments on commit 4565d48

Please sign in to comment.