Browse Source

For 9ba1995060:

lib64 is not present under win32.
master
Kolan Sh 1 year ago
parent
commit
ab63ce22a9
3 changed files with 15 additions and 9 deletions
  1. 5
    3
      CPackCommonRules.cmake
  2. 5
    3
      PkgConfigCommonRules.cmake
  3. 5
    3
      ValaLibCommonRules.cmake

+ 5
- 3
CPackCommonRules.cmake View File

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

+ 5
- 3
PkgConfigCommonRules.cmake View File

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

+ 5
- 3
ValaLibCommonRules.cmake View File

@@ -43,9 +43,11 @@ IF (LibIsPlugin)
43 43
 ENDIF (LibIsPlugin)
44 44
 
45 45
 SET (lib "lib")
46
-IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
47
-  SET (lib "lib64")
48
-ENDIF()
46
+IF(UNIX)
47
+  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
48
+    SET (lib "lib64")
49
+  ENDIF()
50
+ENDIF(UNIX)
49 51
 
50 52
 IF (UNIX)
51 53
   SET (install_dest ${lib}${install_prefix})

Loading…
Cancel
Save