Skip to content

Commit d124bd7

Browse files
committed
Merge pull request #1323 from UV-CDAT/osx_sdk_determination_corrected
checking wrong part of version for OS SDK determination
2 parents 91e9f3b + 9de4739 commit d124bd7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,17 @@ if(APPLE)
120120
set(HAVE_10_10_SDK TRUE)
121121
endif()
122122
# Try for the lowest version SDK we can
123-
if ((${OSX_VER_MAJOR} VERSION_EQUAL 8) AND (HAVE_10_8_SDK))
123+
if ((${OSX_VER_MINOR} VERSION_EQUAL 8) AND (HAVE_10_8_SDK))
124124
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -headerpad_max_install_names")
125125
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8 CACHE STRING "" FORCE)
126126
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk" CACHE PATH "" FORCE)
127-
elseif((${OS_X_VER_MAJOR} VERSION_EQUAL 9) AND (HAVE_10_9_SDK))
127+
elseif((${OSX_VER_MINOR} VERSION_EQUAL 9) AND (HAVE_10_9_SDK))
128128
set(CMAKE_C_COMPILER clang)
129129
set(CMAKE_CXX_COMPILER clang++)
130130
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -headerpad_max_install_names")
131131
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9 CACHE STRING "" FORCE)
132132
set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk" CACHE PATH "" FORCE)
133-
elseif((${OSX_VER_MAJOR} VERSION_EQUAL 10) AND (HAVE_10_10_SDK))
133+
elseif((${OSX_VER_MINOR} VERSION_EQUAL 10) AND (HAVE_10_10_SDK))
134134
set(CMAKE_C_COMPILER clang)
135135
set(CMAKE_CXX_COMPILER clang++)
136136
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -headerpad_max_install_names")

0 commit comments

Comments
 (0)