diff --git a/.gitignore b/.gitignore index c82efefc..869df82f 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2de57f1b..1f6a2e48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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! ## diff --git a/config/CMakeChecks.txt b/cmake/CMakeChecks.txt similarity index 88% rename from config/CMakeChecks.txt rename to cmake/CMakeChecks.txt index c72bf7fc..9583e0f2 100644 --- a/config/CMakeChecks.txt +++ b/cmake/CMakeChecks.txt @@ -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() diff --git a/config/Doxyfile.in b/cmake/Doxyfile.in similarity index 100% rename from config/Doxyfile.in rename to cmake/Doxyfile.in diff --git a/config/FindIconv.cmake b/cmake/FindIconv.cmake similarity index 100% rename from config/FindIconv.cmake rename to cmake/FindIconv.cmake diff --git a/config/FindMSGFMT.cmake b/cmake/FindMSGFMT.cmake similarity index 100% rename from config/FindMSGFMT.cmake rename to cmake/FindMSGFMT.cmake diff --git a/config/FindSSH.cmake b/cmake/FindSSH.cmake similarity index 100% rename from config/FindSSH.cmake rename to cmake/FindSSH.cmake diff --git a/config/compilerFlags.cmake b/cmake/compilerFlags.cmake similarity index 100% rename from config/compilerFlags.cmake rename to cmake/compilerFlags.cmake diff --git a/config/config.h.cmake b/cmake/config.h.cmake similarity index 100% rename from config/config.h.cmake rename to cmake/config.h.cmake diff --git a/config/exiv2.lsm.cmake b/cmake/exiv2.lsm.cmake similarity index 100% rename from config/exiv2.lsm.cmake rename to cmake/exiv2.lsm.cmake diff --git a/config/exiv2.pc.cmake b/cmake/exiv2.pc.cmake similarity index 100% rename from config/exiv2.pc.cmake rename to cmake/exiv2.pc.cmake diff --git a/config/exiv2.pc.in b/cmake/exiv2.pc.in similarity index 100% rename from config/exiv2.pc.in rename to cmake/exiv2.pc.in diff --git a/config/exiv2_uninstall.cmake b/cmake/exiv2_uninstall.cmake similarity index 100% rename from config/exiv2_uninstall.cmake rename to cmake/exiv2_uninstall.cmake diff --git a/config/findDependencies.cmake b/cmake/findDependencies.cmake similarity index 97% rename from config/findDependencies.cmake rename to cmake/findDependencies.cmake index 683a2a47..e220e2f1 100644 --- a/config/findDependencies.cmake +++ b/cmake/findDependencies.cmake @@ -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) diff --git a/config/generateConfigFile.cmake b/cmake/generateConfigFile.cmake similarity index 96% rename from config/generateConfigFile.cmake rename to cmake/generateConfigFile.cmake index 8fa3b33f..e7a07f73 100644 --- a/config/generateConfigFile.cmake +++ b/cmake/generateConfigFile.cmake @@ -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) diff --git a/config/generateDoc.cmake b/cmake/generateDoc.cmake similarity index 100% rename from config/generateDoc.cmake rename to cmake/generateDoc.cmake diff --git a/config/printSummary.cmake b/cmake/printSummary.cmake similarity index 100% rename from config/printSummary.cmake rename to cmake/printSummary.cmake