For 9ba1995060ebb1c65ac9855e3671b3992c859059:

lib64 is not present under win32.
2018-06-20 13:55:49 +03:00 · 2018-06-20 13:55:49 +03:00 · ab63ce22a9
parent cd1394cb27
commit ab63ce22a9
3 changed files with 15 additions and 9 deletions
--- 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 (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}")
--- a/PkgConfigCommonRules.cmake
+++ b/PkgConfigCommonRules.cmake
@ -5,9 +5,11 @@ ELSE (WIN32)
 ENDIF (WIN32)
 SET (PkgConfigExecPrefix "\${prefix}")
 SET (lib "lib")
+IF(UNIX)
  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
    SET (lib "lib64")
  ENDIF()
+ENDIF(UNIX)
 SET (PkgConfigLibDir "\${exec_prefix}/${lib}")
 SET (PkgConfigIncludeDir "\${prefix}/include")

--- a/ValaLibCommonRules.cmake
+++ b/ValaLibCommonRules.cmake
@ -43,9 +43,11 @@ IF (LibIsPlugin)
 ENDIF (LibIsPlugin)

 SET (lib "lib")
+IF(UNIX)
  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
    SET (lib "lib64")
  ENDIF()
+ENDIF(UNIX)

 IF (UNIX)
  SET (install_dest ${lib}${install_prefix})