kolan
/
cmake.backbone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

For 9ba1995060ebb1c65ac9855e3671b3992c859059: 

lib64 is not present under win32.
This commit is contained in:
Kolan Sh 2018-06-20 13:55:49 +03:00
parent cd1394cb27
commit ab63ce22a9
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CPackCommonRules.cmake
View File

@ -13,9 +13,11 @@ SET (CPACK_PACKAGE_DESCRIPTION_FILE
SET (pkgconfig_file "${PROJECT_BINARY_DIR}/pkg-config/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc") SET (pkgconfig_file "${PROJECT_BINARY_DIR}/pkg-config/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc")
IF (EXISTS ${pkgconfig_file}) IF (EXISTS ${pkgconfig_file})
SET (lib "lib") SET (lib "lib")
IF (UNIX)
IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
SET (lib "lib64") SET (lib "lib64")
ENDIF() ENDIF()
ENDIF(UNIX)
INSTALL (FILES ${pkgconfig_file} DESTINATION ${lib}/pkgconfig) INSTALL (FILES ${pkgconfig_file} DESTINATION ${lib}/pkgconfig)
ENDIF () ENDIF ()
#SET (CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME}") #SET (CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME}")

2
PkgConfigCommonRules.cmake
View File

@ -5,9 +5,11 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
SET (PkgConfigExecPrefix "\${prefix}") SET (PkgConfigExecPrefix "\${prefix}")
SET (lib "lib") SET (lib "lib")
IF(UNIX)
IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
SET (lib "lib64") SET (lib "lib64")
ENDIF() ENDIF()
ENDIF(UNIX)
SET (PkgConfigLibDir "\${exec_prefix}/${lib}") SET (PkgConfigLibDir "\${exec_prefix}/${lib}")
SET (PkgConfigIncludeDir "\${prefix}/include") SET (PkgConfigIncludeDir "\${prefix}/include")

2
ValaLibCommonRules.cmake
View File

@ -43,9 +43,11 @@ IF (LibIsPlugin)
ENDIF (LibIsPlugin) ENDIF (LibIsPlugin)
SET (lib "lib") SET (lib "lib")
IF(UNIX)
IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
SET (lib "lib64") SET (lib "lib64")
ENDIF() ENDIF()
ENDIF(UNIX)
IF (UNIX) IF (UNIX)
SET (install_dest ${lib}${install_prefix}) SET (install_dest ${lib}${install_prefix})