Skip to content

Commit 9f6e9ba

Browse files
committed
Do not install to lib64, even on x86_64 machines
1 parent 07ccdc1 commit 9f6e9ba

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

cmake/internal/FindOS.cmake

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,28 @@ ELSE (PROJECT_OS_LINUX)
4545
ENDIF (PROJECT_OS_LINUX)
4646

4747
# 32 or 64 bit Linux
48-
IF (PROJECT_OS_LINUX)
49-
# Set the library directory suffix accordingly
50-
IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
51-
SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
52-
MESSAGE (STATUS "Linux x86_64 Detected")
53-
ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
54-
MESSAGE (STATUS "Linux ppc64 Detected")
55-
SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
56-
ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
57-
MESSAGE (STATEUS "Linux s390x Detected")
58-
SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
59-
ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
60-
ENDIF (PROJECT_OS_LINUX)
48+
# IF (PROJECT_OS_LINUX)
49+
# # Set the library directory suffix accordingly
50+
# IF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
51+
# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
52+
# MESSAGE (STATUS "Linux x86_64 Detected")
53+
# ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
54+
# MESSAGE (STATUS "Linux ppc64 Detected")
55+
# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
56+
# ELSEIF ($CMAKE_SYSTEM_PROCESSOR} STREQUAL "s390x")
57+
# MESSAGE (STATEUS "Linux s390x Detected")
58+
# SET (PROJECT_PROC_64BIT TRUE BOOL INTERNAL)
59+
# ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
60+
# ENDIF (PROJECT_OS_LINUX)
6161

62-
IF(PROJECT_PROC_64BIT)
62+
# IF(PROJECT_PROC_64BIT)
6363
# Set the install path to lib64
64-
SET(PROJECT_LIB_DIR "lib64")
65-
SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
66-
ELSE (PROJECT_PROC_64BIT)
64+
# SET(PROJECT_LIB_DIR "lib64")
65+
# SET(PROJECT_PLUGIN_DIR "lib64/${PROJECT_NAME}-${APIVERSION}")
66+
# ELSE (PROJECT_PROC_64BIT)
6767
SET(PROJECT_LIB_DIR "lib")
6868
SET(PROJECT_PLUGIN_DIR "lib/${PROJECT_NAME}-${APIVERSION}")
69-
ENDIF (PROJECT_PROC_64BIT)
69+
# ENDIF (PROJECT_PROC_64BIT)
7070

7171
MESSAGE(STATUS "Installing Libraries to ${CMAKE_INSTALL_PREFIX}/${PROJECT_LIB_DIR}")
7272
MESSAGE(STATUS "Installing Plugins to ${CMAKE_INSTALL_PREFIX}/${PROJECT_PLUGIN_DIR}")

0 commit comments

Comments
 (0)