No commit message

brechtsanders · Jul 5, 2022 · 47fd7b9 · 47fd7b9
1 parent f83a714
commit 47fd7b9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -210,22 +210,22 @@ INSTALL(TARGETS ${ALLTARGETS_LIB}
   RUNTIME DESTINATION bin
 )
 INSTALL(EXPORT xlsxioTargets
-    NAMESPACE xlsxio::
-    DESTINATION share/xlsxio
+  NAMESPACE xlsxio::
+  DESTINATION cmake
 )
 FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in"
-[[include(CMakeFindDependencyMacro)
-if (@WITH_LIBZIP@)
+[[INCLUDE(CMakeFindDependencyMacro)
+IF (@WITH_LIBZIP@)
   FIND_DEPENDENCY(LibZip)
-else()
+ELSE()
   FIND_DEPENDENCY(minizip CONFIG)
-endif()
-if (@EXPAT_DIR@)
+ENDIF()
+IF (@EXPAT_DIR@)
   FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR})
   FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR})
-else()
+ELSE()
   FIND_DEPENDENCY(EXPAT)
-endif()
+ENDIF()
 
 IF(@WITH_WIDE@)
   IF(@EXPAT_DIR@)
@@ -238,7 +238,7 @@ ENDIF()
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/xlsxioTargets.cmake")
 ]])
 CONFIGURE_FILE("${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" @ONLY)
-INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" DESTINATION share/xlsxio)
+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" DESTINATION cmake)
 
 INSTALL(TARGETS ${ALLTARGETS_EXE}
   ARCHIVE DESTINATION lib
@@ -268,7 +268,7 @@ MACRO(generate_and_install_config_files _NAME _DESC _LIBS _HEADER)
   STRING(REGEX REPLACE "\([^ ]*\)[/\\]lib([^ /\\.]*).[^ ]*" "-L\\1 -l\\2" XLSXIO_LDFLAGS "${XLSXIO_LDFLAGS}")
   CONFIGURE_FILE(templateConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}Config.cmake" @ONLY)
   CONFIGURE_FILE(templateConfigVersion.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}ConfigVersion.cmake" @ONLY)
-  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}ConfigVersion.cmake" DESTINATION cmake/)
+  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}Config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}ConfigVersion.cmake" DESTINATION cmake)
   IF (BUILD_PC_FILES)
     CONFIGURE_FILE(template.pc.in "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}.pc" @ONLY)
     INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${XLSXIO_NAME}.pc" DESTINATION lib/pkgconfig)

diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,9 @@
+0.2.33
+
+2022-07-05  Brecht Sanders  https://github.com/brechtsanders/
+
+  * PR from JackBoosY to export CMake targets automaticly (to cmake folder under install path)
+
 0.2.32
 
 2022-04-15  Brecht Sanders  https://github.com/brechtsanders/

diff --git a/include/xlsxio_version.h b/include/xlsxio_version.h
@@ -49,7 +49,7 @@ THE SOFTWARE.
 /*! \brief minor version number */
 #define XLSXIO_VERSION_MINOR 2
 /*! \brief micro version number */
-#define XLSXIO_VERSION_MICRO 32
+#define XLSXIO_VERSION_MICRO 33
 /*! @} */
 
 /*! \cond PRIVATE */