From ab63ce22a9e2d149d8843f49bd33f8116a862d39 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Wed, 20 Jun 2018 13:55:49 +0300 Subject: [PATCH] For 9ba1995060ebb1c65ac9855e3671b3992c859059: lib64 is not present under win32. --- CPackCommonRules.cmake | 8 +++++--- PkgConfigCommonRules.cmake | 8 +++++--- ValaLibCommonRules.cmake | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CPackCommonRules.cmake b/CPackCommonRules.cmake index 9ff677a..7a4cd12 100644 --- a/CPackCommonRules.cmake +++ b/CPackCommonRules.cmake @@ -13,9 +13,11 @@ SET (CPACK_PACKAGE_DESCRIPTION_FILE SET (pkgconfig_file "${PROJECT_BINARY_DIR}/pkg-config/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc") IF (EXISTS ${pkgconfig_file}) SET (lib "lib") - IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - SET (lib "lib64") - ENDIF() + IF (UNIX) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + SET (lib "lib64") + ENDIF() + ENDIF(UNIX) INSTALL (FILES ${pkgconfig_file} DESTINATION ${lib}/pkgconfig) ENDIF () #SET (CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME}") diff --git a/PkgConfigCommonRules.cmake b/PkgConfigCommonRules.cmake index 49a2645..0fb592b 100644 --- a/PkgConfigCommonRules.cmake +++ b/PkgConfigCommonRules.cmake @@ -5,9 +5,11 @@ ELSE (WIN32) ENDIF (WIN32) SET (PkgConfigExecPrefix "\${prefix}") SET (lib "lib") -IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - SET (lib "lib64") -ENDIF() +IF(UNIX) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + SET (lib "lib64") + ENDIF() +ENDIF(UNIX) SET (PkgConfigLibDir "\${exec_prefix}/${lib}") SET (PkgConfigIncludeDir "\${prefix}/include") diff --git a/ValaLibCommonRules.cmake b/ValaLibCommonRules.cmake index 147808b..9baaa9b 100644 --- a/ValaLibCommonRules.cmake +++ b/ValaLibCommonRules.cmake @@ -43,9 +43,11 @@ IF (LibIsPlugin) ENDIF (LibIsPlugin) SET (lib "lib") -IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - SET (lib "lib64") -ENDIF() +IF(UNIX) + IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + SET (lib "lib64") + ENDIF() +ENDIF(UNIX) IF (UNIX) SET (install_dest ${lib}${install_prefix})