Skip to content

Commit c8c1619

Browse files
author
Brenton Bostick
committed
Fix 429163: fix Windows platform detection
1 parent 2240560 commit c8c1619

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmake/WolframKernel.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
if(NOT DEFINED MATHEMATICA_INSTALL_DIR)
3-
if(CMAKE_HOST_WIN32 OR CYGWIN)
3+
if(CMAKE_HOST_WIN32)
44
set(MATHEMATICA_INSTALL_DIR "C:/Program Files/Wolfram Research/Mathematica/13.1")
55
elseif(CMAKE_HOST_APPLE)
66
set(MATHEMATICA_INSTALL_DIR /Applications/Mathematica.app/Contents)
@@ -9,7 +9,7 @@ else()
99
endif()
1010
endif()
1111

12-
if(MSVC)
12+
if(CMAKE_HOST_WIN32)
1313
set(WOLFRAMKERNEL_DEFAULT ${MATHEMATICA_INSTALL_DIR}/wolfram.exe)
1414
set(WOLFRAMLIBRARY_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/IncludeFiles/C)
1515
#
@@ -30,7 +30,7 @@ if(MSVC)
3030
else()
3131
set(MATHLINK_LIB_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions)
3232
endif()
33-
elseif (APPLE)
33+
elseif(CMAKE_HOST_APPLE)
3434
set(WOLFRAMKERNEL_DEFAULT ${MATHEMATICA_INSTALL_DIR}/MacOS/WolframKernel)
3535
set(WOLFRAMLIBRARY_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/IncludeFiles/C)
3636
set(MATHLINK_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/MacOSX-x86-64/CompilerAdditions)

0 commit comments

Comments
 (0)