mygui: 3.4.1 -> 3.4.2
This commit is contained in:
parent
3368e885d8
commit
c71fa0b88f
|
@ -20,13 +20,13 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mygui";
|
pname = "mygui";
|
||||||
version = "3.4.1";
|
version = "3.4.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "MyGUI";
|
owner = "MyGUI";
|
||||||
repo = "mygui";
|
repo = "mygui";
|
||||||
rev = "MyGUI${version}";
|
rev = "MyGUI${version}";
|
||||||
hash = "sha256-5u9whibYKPj8tCuhdLOhL4nDisbFAB0NxxdjU/8izb8=";
|
hash = "sha256-yBV0ImOFJlqBPqqOjXYe4SFO2liSGZCEwvehED5Ubj4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
|
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
|
||||||
index bba3f91..8f4f351 100644
|
index 7e279c986..b33f097c0 100644
|
||||||
--- a/CMake/Utils/MyGUIConfigTargets.cmake
|
--- a/CMake/Utils/MyGUIConfigTargets.cmake
|
||||||
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
|
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
|
||||||
@@ -477,14 +477,6 @@ function(mygui_config_lib PROJECTNAME)
|
@@ -418,15 +418,6 @@ function(mygui_config_lib PROJECTNAME)
|
||||||
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
|
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
|
||||||
# add GCC visibility flags to shared library build
|
# add GCC visibility flags to shared library build
|
||||||
set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
|
set_target_properties(${PROJECTNAME} PROPERTIES COMPILE_FLAGS "${MYGUI_GCC_VISIBILITY_FLAGS}")
|
||||||
|
@ -12,7 +12,8 @@ index bba3f91..8f4f351 100644
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}")
|
- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}")
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME})
|
- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME})
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
|
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
|
||||||
- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../Frameworks")
|
- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE)
|
||||||
|
- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib")
|
||||||
- endif (APPLE)
|
- endif (APPLE)
|
||||||
endif ()
|
endif ()
|
||||||
endif (MYGUI_STATIC)
|
endif (MYGUI_STATIC)
|
||||||
|
|
Loading…
Reference in a new issue