Skip to content

Commit d9fcbe4

Browse files
committed
don't install in lib64 on mac
things usually just go in lib
1 parent fc692eb commit d9fcbe4

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/CMakeLists.txt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,34 +84,33 @@ set( SUFFIX_BIN_DEFAULT "" )
8484

8585
if(TARGET_PLATFORM EQUAL 32 OR TARGET_PLATFORM EQUAL 64)
8686
set(TARGET_PLATFORM ${TARGET_PLATFORM} CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
87-
if( TARGET_PLATFORM EQUAL 64 )
88-
set( SUFFIX_LIB_DEFAULT "64" )
89-
endif( )
9087
else()
9188
if(CMAKE_SIZEOF_VOID_P MATCHES 8)
9289
set(TARGET_PLATFORM "64" CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
93-
set( SUFFIX_LIB_DEFAULT "64" )
9490
else()
9591
set(TARGET_PLATFORM "32" CACHE STRING "Target platform type (32-bit or 64-bit)" FORCE)
9692
endif()
9793
endif()
9894

99-
set( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
100-
set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
101-
102-
if( MSVC_IDE )
103-
set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
104-
endif( )
105-
10695
message(STATUS "Target platform: ${TARGET_PLATFORM}-bit")
10796
if(TARGET_PLATFORM EQUAL 32)
10897
set(_arch "x86" INTERNAL)
10998
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
11099
else()
111100
set(_arch "x86_64" INTERNAL)
112101
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
102+
if( NOT APPLE )
103+
set( SUFFIX_LIB_DEFAULT "64" )
104+
endif( )
113105
endif()
114106

107+
set( SUFFIX_LIB ${SUFFIX_LIB_DEFAULT} CACHE STRING "String to append to 'lib' install path" )
108+
set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
109+
110+
if( MSVC_IDE )
111+
set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
112+
endif( )
113+
115114
# add the math library for Linux
116115
if( UNIX )
117116
set(MATH_LIBRARY "m")

0 commit comments

Comments
 (0)