File tree Expand file tree Collapse file tree 1 file changed +10
-11
lines changed
Expand file tree Collapse file tree 1 file changed +10
-11
lines changed Original file line number Diff line number Diff line change @@ -85,34 +85,33 @@ set( SUFFIX_BIN_DEFAULT "" )
8585
8686if (TARGET_PLATFORM EQUAL 32 OR TARGET_PLATFORM EQUAL 64)
8787 set (TARGET_PLATFORM ${TARGET_PLATFORM} CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
88- if ( TARGET_PLATFORM EQUAL 64 )
89- set ( SUFFIX_LIB_DEFAULT "64" )
90- endif ( )
9188else ()
9289 if (CMAKE_SIZEOF_VOID_P MATCHES 8)
9390 set (TARGET_PLATFORM "64" CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
94- set ( SUFFIX_LIB_DEFAULT "64" )
9591 else ()
9692 set (TARGET_PLATFORM "32" CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
9793 endif ()
9894endif ()
9995
100- set ( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
101- set ( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
102-
103- if ( MSVC_IDE )
104- set_property ( GLOBAL PROPERTY USE_FOLDERS TRUE )
105- endif ( )
106-
10796message (STATUS "Target platform: ${TARGET_PLATFORM} -bit" )
10897if (TARGET_PLATFORM EQUAL 32)
10998 set (_arch "x86" INTERNAL )
11099 set_property (GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
111100else ()
112101 set (_arch "x86_64" INTERNAL )
113102 set_property (GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
103+ if ( NOT APPLE )
104+ set ( SUFFIX_LIB_DEFAULT "64" )
105+ endif ( )
114106endif ()
115107
108+ set ( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
109+ set ( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
110+
111+ if ( MSVC_IDE )
112+ set_property ( GLOBAL PROPERTY USE_FOLDERS TRUE )
113+ endif ( )
114+
116115# add the math library for Linux
117116if ( UNIX )
118117 set (MATH_LIBRARY "m" )
You can’t perform that action at this time.
0 commit comments