Skip to content

Commit 053b91a

Browse files
committed
swig: FindJULIA: merged upstream
1 parent c16b1ee commit 053b91a

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

swig/FindJULIA.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Original FindJulia.cmake from https://github.com/QuantStack/xtensor-julia-cookiecutter/blob/master/%7B%7Bcookiecutter.github_project_name%7D%7D/cmake/FindJulia.cmake
2+
# https://github.com/JuliaInterop/libcxxwrap-julia/blob/main/FindJulia.cmake
23

34
if(Julia_FOUND)
45
return()
@@ -73,14 +74,15 @@ elseif(Julia_EXECUTABLE)
7374
elseif(Julia_PREFIX)
7475
set(Julia_INCLUDE_DIRS ${Julia_PREFIX}/include/julia)
7576
endif()
77+
set(Julia_INCLUDE_DIRS ${Julia_INCLUDE_DIRS};$ENV{includedir})
7678
MESSAGE(STATUS "Julia_INCLUDE_DIRS: ${Julia_INCLUDE_DIRS}")
7779

7880
###################
7981
# Julia Libraries #
8082
###################
8183

8284
if(WIN32)
83-
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .a)
85+
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} .a;.dll)
8486
endif()
8587

8688
if(Julia_EXECUTABLE)
@@ -164,6 +166,10 @@ if(Julia_EXECUTABLE)
164166
MESSAGE(STATUS "Julia_WORD_SIZE: ${Julia_WORD_SIZE}")
165167
endif()
166168

169+
if($ENV{target} MATCHES "^i686.*")
170+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2")
171+
endif()
172+
167173
###########################
168174
# FindPackage Boilerplate #
169175
###########################

0 commit comments

Comments
 (0)