PR#802: Use correct case for CMake. - packaging-committee

packaging-committee

#802 Use correct case for CMake.

Merged 5 years ago by ignatenkobrain. Opened 5 years ago by qulogic.

qulogic/packaging-committee cmake into master

Use correct case for CMake.

Elliott Sales de Andrade • 5 years ago

54c5249

guidelines/modules/ROOT/nav.adoc

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`* xref:AppData.adoc[AppData]`
		`* xref:AutoProvidesAndRequiresFiltering.adoc[AutoProvidesAndRequiresFiltering]`
		`* xref:C_and_C++.adoc[C and {cpp}]`
		`- * xref:Cmake.adoc[Cmake]`
		`+ * xref:CMake.adoc[CMake]`
		`* xref:Conflicts.adoc[Conflicts]`
		`* xref:CronFiles.adoc[CronFiles]`
		`* xref:CryptoPolicies.adoc[CryptoPolicies]`

guidelines/modules/ROOT/pages/CMake.adoc ~~guidelines/modules/ROOT/pages/Cmake.adoc~~

file renamed

+12 -6

		`@@ -1,10 +1,10 @@`
		`- = Guidelines for cmake`
		`+ = Guidelines for CMake`

		`- This document provides cmake best-practices for generating Fedora RPMS using cmake`
		`+ This document provides CMake best-practices for generating Fedora RPMS using CMake`

		`== RPM Macros`

		`- If cmake is installed, see /usr/lib/rpm/macros.d/cmake or /etc/rpm/macros.cmake on EL6.`
		`+ If CMake is installed, see /usr/lib/rpm/macros.d/cmake or /etc/rpm/macros.cmake on EL6.`

		`If kde-filesystem is installed, see /usr/lib/rpm/macros.d/macros.kde4`

		`@@ -25,11 +25,17 @@`

		`== Notes`

		- NOTE: `+-DCMAKE_SKIP_RPATH:BOOL=ON+`. With recent cmake-2.4, it should not be used. This cmake version should handle RPATHs issues correctly (set them in build-dir, remove them during installation). Setting `+CMAKE_SKIP_RPATH+` for this version would avoid RPATHs in build-dir too. This might link binaries against system-libraries (e.g. when a previous version of the package was installed) instead of the libraries which were created by the build.
		+ NOTE: `+-DCMAKE_SKIP_RPATH:BOOL=ON+`.
		`+ With recent cmake-2.4, it should not be used.`
		`+ This CMake version should handle RPATHs issues correctly (set them in build-dir, remove them during installation).`
		+ Setting `+CMAKE_SKIP_RPATH+` for this version would avoid RPATHs in build-dir too.
		`+ This might link binaries against system-libraries (e.g. when a previous version of the package was installed) instead of the libraries which were created by the build.`

		- Nevertheless, RPATH issues might arise when cmake was used improperly. E.g. installing a target with `+INSTALL(FILES ... RENAME ...)+` will not strip rpaths; in this case `+INSTALL(TARGETS ...)+` must be used in combination with changing the `+OUTPUT_NAME+` property.
		`+ Nevertheless, RPATH issues might arise when CMake was used improperly.`
		+ For example, installing a target with `+INSTALL(FILES ... RENAME ...)+` will not strip rpaths;
		+ in this case `+INSTALL(TARGETS ...)+` must be used in combination with changing the `+OUTPUT_NAME+` property.

		`- NOTE: cmake has good documentation in two places:`
		`+ NOTE: CMake has good documentation in two places:`

		`* http://www.cmake.org/documentation/`
		`* http://www.cmake.org/Wiki/CMake`

guidelines/modules/ROOT/pages/MinGW.adoc

file modified

+4 -4

		`@@ -206,8 +206,8 @@`
		`\|==================================================================================================================================================`
		`\|Macro \|Available in +`
		`mingw-filesystem \|Explanation`
		`- \|mingw_cmake \|>= 95 \|Call the cmake binary for all the configured targets`
		`- \|mingw_cmake_kde4 \|>= 95 \|Call the cmake binary for all the configured targets with KDE4 specific parameters set`
		`+ \|mingw_cmake \|>= 95 \|Call the 'cmake' binary for all the configured targets`
		`+ \|mingw_cmake_kde4 \|>= 95 \|Call the 'cmake' binary for all the configured targets with KDE4 specific parameters set`
		`\|mingw_configure \|>= 95 \|Call the configure command for all the configured targets`
		`\|mingw_make \|>= 95 \|Call the 'make' command for all the configured targets`
		`\|mingw_meson \|>= 104 \|Call the meson binary for all the configured targets`
		`@@ -228,7 +228,7 @@`
		`\|mingw32_ar \|>= 95 \|i686-w64-mingw32-ar \|cross compiler 'ar' binary`
		`\|mingw32_cc \|>= 95 \|i686-w64-mingw32-gcc \|cross compiler 'gcc' binary`
		`\|mingw32_cflags \|>= 95 \|-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 \|Default compiler flags for C/C++ binaries`
		`- \|mingw32_cmake \|>= 95 \| \|Call the cmake binary for the Win32 target`
		`+ \|mingw32_cmake \|>= 95 \| \|Call the 'cmake' binary for the Win32 target`
		`\|mingw32_configure \|>= 95 \| \|standard invocation for autotools 'configure' scripts`
		`\|mingw32_cpp \|>= 95 \|i686-w64-mingw32-gcc -E \|cross compiler 'cpp' binary`
		`\|mingw32_env \|>= 95 \| \|Set the correct environment variables for the Win32 target`
		`@@ -254,7 +254,7 @@`
		`\|mingw64_ar \|>= 95 \|x86_64-w64-mingw32-ar \|cross compiler 'ar' binary`
		`\|mingw64_cc \|>= 95 \|x86_64-w64-mingw32-gcc \|cross compiler 'gcc' binary`
		`\|mingw64_cflags \|>= 95 \|-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 \|Default compiler flags for C/C++ binaries`
		`- \|mingw64_cmake \|>= 95 \| \|Call the cmake binary for the Win64 target`
		`+ \|mingw64_cmake \|>= 95 \| \|Call the 'cmake' binary for the Win64 target`
		`\|mingw64_configure \|>= 95 \| \|standard invocation for autotools 'configure' scripts`
		`\|mingw64_cpp \|>= 95 \|x86_64-w64-mingw32-gcc -E \|cross compiler 'cpp' binary`
		`\|mingw64_env \|>= 95 \| \|Set the correct environment variables for the Win64 target`

guidelines/modules/ROOT/pages/index.adoc

file modified

+1 -1

		`@@ -1550,7 +1550,7 @@`

		`* xref:Ada.adoc[Ada]`
		`* xref:C_and_C++.adoc[C and {cpp}]`
		`- * xref:Cmake.adoc[Cmake]`
		`+ * xref:CMake.adoc[CMake]`
		`* xref:D.adoc[D]`
		`* xref:DevAssistant.adoc[DevAssistant]`
		`* xref:Drupal7.adoc[Drupal7]`

qulogic commented 5 years ago

Just a minor case correction.

Metadata

Assignee

None

Tags

No Tags

Changes Summary 4

+1 -1

file changed

guidelines/modules/ROOT/nav.adoc

+12 -6

file renamed

~~guidelines/modules/ROOT/pages/Cmake.adoc~~
guidelines/modules/ROOT/pages/CMake.adoc

+4 -4

file changed

guidelines/modules/ROOT/pages/MinGW.adoc

+1 -1

file changed

guidelines/modules/ROOT/pages/index.adoc

		`@@ -206,8 +206,8 @@`
		`\|==================================================================================================================================================`
		`\|Macro \|Available in +`
		`mingw-filesystem \|Explanation`
		`- \|mingw_cmake \|>= 95 \|Call the cmake binary for all the configured targets`
		`- \|mingw_cmake_kde4 \|>= 95 \|Call the cmake binary for all the configured targets with KDE4 specific parameters set`
		`+ \|mingw_cmake \|>= 95 \|Call the 'cmake' binary for all the configured targets`
		`+ \|mingw_cmake_kde4 \|>= 95 \|Call the 'cmake' binary for all the configured targets with KDE4 specific parameters set`
		`\|mingw_configure \|>= 95 \|Call the configure command for all the configured targets`
		`\|mingw_make \|>= 95 \|Call the 'make' command for all the configured targets`
		`\|mingw_meson \|>= 104 \|Call the meson binary for all the configured targets`
		`@@ -228,7 +228,7 @@`
		`\|mingw32_ar \|>= 95 \|i686-w64-mingw32-ar \|cross compiler 'ar' binary`
		`\|mingw32_cc \|>= 95 \|i686-w64-mingw32-gcc \|cross compiler 'gcc' binary`
		`\|mingw32_cflags \|>= 95 \|-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 \|Default compiler flags for C/C++ binaries`
		`- \|mingw32_cmake \|>= 95 \| \|Call the cmake binary for the Win32 target`
		`+ \|mingw32_cmake \|>= 95 \| \|Call the 'cmake' binary for the Win32 target`
		`\|mingw32_configure \|>= 95 \| \|standard invocation for autotools 'configure' scripts`
		`\|mingw32_cpp \|>= 95 \|i686-w64-mingw32-gcc -E \|cross compiler 'cpp' binary`
		`\|mingw32_env \|>= 95 \| \|Set the correct environment variables for the Win32 target`
		`@@ -254,7 +254,7 @@`
		`\|mingw64_ar \|>= 95 \|x86_64-w64-mingw32-ar \|cross compiler 'ar' binary`
		`\|mingw64_cc \|>= 95 \|x86_64-w64-mingw32-gcc \|cross compiler 'gcc' binary`
		`\|mingw64_cflags \|>= 95 \|-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 \|Default compiler flags for C/C++ binaries`
		`- \|mingw64_cmake \|>= 95 \| \|Call the cmake binary for the Win64 target`
		`+ \|mingw64_cmake \|>= 95 \| \|Call the 'cmake' binary for the Win64 target`
		`\|mingw64_configure \|>= 95 \| \|standard invocation for autotools 'configure' scripts`
		`\|mingw64_cpp \|>= 95 \|x86_64-w64-mingw32-gcc -E \|cross compiler 'cpp' binary`
		`\|mingw64_env \|>= 95 \| \|Set the correct environment variables for the Win64 target`

packaging-committee

Source Code

#802 Use correct case for CMake. Merged 5 years ago by ignatenkobrain. Opened 5 years ago by qulogic. qulogic/packaging-committee cmake into master

Metadata

Changes Summary 4

#802 Use correct case for CMake.

Merged 5 years ago by ignatenkobrain. Opened 5 years ago by qulogic.

qulogic/packaging-committee cmake into master