-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix backward logic to work correctly on Windows (#16)
automerged PR by conda-forge/automerge-action
- Loading branch information
Showing
7 changed files
with
19 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
c_compiler: | ||
- vs2017 | ||
- vs2019 | ||
channel_sources: | ||
- conda-forge | ||
channel_targets: | ||
- conda-forge main | ||
cxx_compiler: | ||
- vs2017 | ||
- vs2019 | ||
target_platform: | ||
- win-64 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,15 @@ | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 9f64f01..c272803 100644 | ||
index 8bd7561..9bbdc73 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -38,12 +38,7 @@ install (TARGETS backward DESTINATION ${LIB_INSTALL_DIR}) | ||
@@ -41,7 +41,9 @@ install (TARGETS backward | ||
|
||
#=============================================================================== | ||
# Used for the installed version. | ||
-if(APPLE) | ||
- # On macOS, the full path to the library since DYLD_LIBRARY_PATH may not work. | ||
- set(backward_library_name ${CMAKE_INSTALL_FULL_LIBDIR}/$<TARGET_FILE_NAME:backward>) | ||
-else() | ||
- set(backward_library_name $<TARGET_FILE_NAME:backward>) | ||
-endif() | ||
+set(backward_library_name ${CMAKE_INSTALL_FULL_LIBDIR}/$<TARGET_FILE_NAME:backward>) | ||
|
||
# Two steps to create `ign`, First using `configure_file`, to interpolate cmake variables. Then | ||
# use `file(GENERATE ...)` to use generator expressions | ||
+if(NOT WIN32) | ||
+ # If we are not on Windows specify the full path as the different ways that dlopen | ||
+ # has to find libraries without full path may not work (while on Windows PATH should work) | ||
# On macOS, the full path to the library since DYLD_LIBRARY_PATH may not work. | ||
set(backward_library_name ${CMAKE_INSTALL_FULL_LIBDIR}/$<TARGET_FILE_NAME:backward>) | ||
else() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters