Merge pull request #107 from oclero/dev

oclero · web-flow · commit 73cb92398a06 · 2025-04-06T15:52:39.000+02:00
v1.2.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.2
+
+- Fix installing includes with double-slashes
+
 ## v1.2.1
 
 - Fix the drop shadows: they now use correctly the device pixel ratio.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_BUILD_PARALLEL_LEVEL $ENV{NUMBER_OF_PROCESSORS})
 # Set project information.
 project("qlementine"
   LANGUAGES CXX
-  VERSION 1.2.1.0
+  VERSION 1.2.2.0
   DESCRIPTION "Modern QStyle for desktop Qt applications."
 )
 set(PROJECT_COPYRIGHT "© Olivier Cléro, MIT License.")
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -172,7 +172,7 @@ install(TARGETS ${PROJECT_NAME}
   INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/")
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 
 install(EXPORT "${PROJECT_NAME}Targets"
   FILE "${PROJECT_NAME}Targets.cmake"

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ set(CMAKE_BUILD_PARALLEL_LEVEL $ENV{NUMBER_OF_PROCESSORS})`
`6`	`6`	`# Set project information.`
`7`	`7`	`project("qlementine"`
`8`	`8`	`LANGUAGES CXX`
`9`		`- VERSION 1.2.1.0`
	`9`	`+ VERSION 1.2.2.0`
`10`	`10`	`DESCRIPTION "Modern QStyle for desktop Qt applications."`
`11`	`11`	`)`
`12`	`12`	`set(PROJECT_COPYRIGHT "© Olivier Cléro, MIT License.")`