Rename config folder to cmake

v0.27.3
Luis Diaz Mas 7 years ago committed by Luis Díaz Más
parent 69ee165291
commit a3444f055e

8
.gitignore vendored

@ -15,10 +15,10 @@ libtool
.libs/
bin/
build*
config/autom4te.cache/
config/config.h
config/config.mk
config/exiv2.pc
cmake/autom4te.cache/
cmake/config.h
cmake/config.mk
cmake/exiv2.pc
po/Makefile
po/Makefile.in
po/POTFILES

@ -86,19 +86,19 @@ if( EXIV2_BUILD_UNIT_TESTS )
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) # Requires CMake 3.3.3
endif()
include(config/findDependencies.cmake REQUIRED)
include(config/compilerFlags.cmake REQUIRED)
include(config/generateConfigFile.cmake REQUIRED)
include(cmake/findDependencies.cmake REQUIRED)
include(cmake/compilerFlags.cmake REQUIRED)
include(cmake/generateConfigFile.cmake REQUIRED)
if (EXIV2_BUILD_DOC)
include(config/generateDoc.cmake REQUIRED)
generate_documentation("${PROJECT_SOURCE_DIR}/config/Doxyfile.in")
include(cmake/generateDoc.cmake REQUIRED)
generate_documentation("${PROJECT_SOURCE_DIR}/cmake/Doxyfile.in")
endif()
include_directories(${CMAKE_BINARY_DIR}) # Make the exv_conf.h file visible for the full project
include( config/CMakeChecks.txt )
include(cmake/CMakeChecks.txt)
if( EXIV2_ENABLE_XMP )
add_subdirectory( xmpsdk )
@ -122,7 +122,7 @@ endif()
# tests
add_custom_target(tests COMMAND env EXIV2_BUILDDIR="${CMAKE_BINARY_DIR}" make tests WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" )
include( config/printSummary.cmake )
include(cmake/printSummary.cmake)
# That's all Folks!
##

@ -35,13 +35,13 @@ if( EXIV2_ENABLE_COMMERCIAL )
add_definitions( -DEXV_COMMERCIAL_VERSION )
endif()
configure_file(config/exiv2_uninstall.cmake ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COPYONLY)
configure_file(cmake/exiv2_uninstall.cmake ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COPYONLY)
add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")
if( NOT MSVC )
configure_file( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY )
configure_file( cmake/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
configure_file( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm)
configure_file( cmake/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig )
endif()

@ -1,5 +1,5 @@
# set include path for FindXXX.cmake files
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
# Check if the conan file exist to find the dependencies
if (EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
@ -47,7 +47,7 @@ if( EXIV2_ENABLE_NLS )
endif()
set( ENABLE_NLS 1 )
# TODO : This is assuming that Intl is always found. This check should be improved and remove
# the manual check in config/generateConfigFile.cmake
# the manual check in cmake/generateConfigFile.cmake
endif( )
find_package(Iconv)

@ -43,4 +43,4 @@ if (NOT EXV_HAVE_LIBINTL_H)
set(EXV_ENABLE_NLS 0)
endif()
configure_file( config/config.h.cmake ${CMAKE_BINARY_DIR}/exv_conf.h @ONLY)
configure_file(cmake/config.h.cmake ${CMAKE_BINARY_DIR}/exv_conf.h @ONLY)
Loading…
Cancel
Save