-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added v4.2.4 and keeping 4.0.0 for now
- Loading branch information
1 parent
a989716
commit 4a01e88
Showing
5 changed files
with
53 additions
and
6 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -793,19 +793,15 @@ if(JAS_ENABLE_SHARED) | ||
# (but later on when installing) | ||
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) | ||
|
||
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") | ||
|
||
# add the automatically determined parts of the RPATH | ||
# which point to directories outside the build tree to the install RPATH | ||
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) | ||
|
||
# The RPATH to be used when installing, but only if it's not a | ||
# system directory | ||
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES | ||
"${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) | ||
if(isSystemDir EQUAL -1) | ||
- set(CMAKE_INSTALL_RPATH | ||
- "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") | ||
endif() | ||
endif() | ||
|
11 changes: 11 additions & 0 deletions
11
recipes/jasper/all/patches/4.0.0-0003-deterministic-libname.patch
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 |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -262,7 +262,7 @@ endif() | ||
# If a multiconfiguration generator is used, ensure that various output | ||
# files are not placed in subdirectories (such as Debug and Release) | ||
# as this will cause the CTest test suite to fail. | ||
-if(JAS_MULTICONFIGURATION_GENERATOR) | ||
+if(0) | ||
if(CMAKE_CONFIGURATION_TYPES) | ||
set(CMAKE_DEBUG_POSTFIX d) | ||
endif() |
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,7 +1,9 @@ | ||
versions: | ||
"4.2.2": | ||
"4.2.4": | ||
folder: all | ||
"4.2.0": | ||
folder: all | ||
"4.1.2": | ||
folder: all | ||
"4.0.0": | ||
folder: all |