diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index c0ac12d04..6cd39fd0e 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -428,11 +428,7 @@ printf "MyGUI 3.2.2... " mv MyGUI-3.2.2-win$BITS MyGUI fi - MYGUI_SDK="`real_pwd`/MyGUI" - - add_cmake_opts -DMYGUISDK="$MYGUI_SDK" \ - -DMYGUI_INCLUDE_DIRS="$MYGUI_SDK/include/MYGUI" \ - -DMYGUI_PREQUEST_FILE="$MYGUI_SDK/include/MYGUI/MyGUI_Prerequest.h" + export MYGUI_HOME="`real_pwd`/MyGUI" if [ $CONFIGURATION == "Debug" ]; then SUFFIX="_d" diff --git a/CMakeLists.txt b/CMakeLists.txt index 14a1c15c8..d1ccb0c66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,11 +271,7 @@ if(QT_STATIC) endif() endif() -find_package(MyGUI REQUIRED) -if (${MYGUI_VERSION} VERSION_LESS "3.2.1") - message(FATAL_ERROR "OpenMW requires MyGUI 3.2.1 or later, please install the latest version from http://mygui.info") -endif() - +find_package(MyGUI 3.2.1 REQUIRED) find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS}) find_package(SDL2 REQUIRED) find_package(OpenAL REQUIRED) @@ -285,12 +281,12 @@ include_directories("." SYSTEM ${SDL2_INCLUDE_DIR} ${Boost_INCLUDE_DIR} - ${MYGUI_INCLUDE_DIRS} + ${MyGUI_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${Bullet_INCLUDE_DIRS} ) -link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ${MYGUI_LIB_DIR}) +link_directories(${SDL2_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS}) if(MYGUI_STATIC) add_definitions(-DMYGUI_STATIC) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index f7a9fea3c..18434c9dd 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -132,7 +132,7 @@ target_link_libraries(openmw ${Boost_PROGRAM_OPTIONS_LIBRARY} ${OPENAL_LIBRARY} ${FFmpeg_LIBRARIES} - ${MYGUI_LIBRARIES} + ${MyGUI_LIBRARIES} ${SDL2_LIBRARY} "osg-ffmpeg-videoplayer" "oics" diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 7a07cd59e..5a5378906 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -209,7 +209,7 @@ target_link_libraries(components ${SDL2_LIBRARY} # For MyGUI platform ${GL_LIB} - ${MYGUI_LIBRARIES} + ${MyGUI_LIBRARIES} ) if (WIN32) diff --git a/plugins/mygui_resource_plugin/CMakeLists.txt b/plugins/mygui_resource_plugin/CMakeLists.txt index 72965c917..be834b17d 100644 --- a/plugins/mygui_resource_plugin/CMakeLists.txt +++ b/plugins/mygui_resource_plugin/CMakeLists.txt @@ -27,6 +27,5 @@ set_target_properties(${MYGUI_RESOURCE_PLUGIN_LIBRARY} PROPERTIES PREFIX "") target_link_libraries(${MYGUI_RESOURCE_PLUGIN_LIBRARY} ${OGRE_LIBRARIES} - ${MYGUI_LIBRARIES} components )