37 lines
1.3 KiB
Plaintext
37 lines
1.3 KiB
Plaintext
$NetBSD: patch-CMakeLists.txt,v 1.1.1.1 2014/02/17 20:38:59 bouyer Exp $
|
|
|
|
Trust wxWidgets when locating its components.
|
|
|
|
--- CMakeLists.txt.orig 2011-07-04 10:40:16.000000000 +0000
|
|
+++ CMakeLists.txt
|
|
@@ -176,11 +176,17 @@ check_find_package_result(OPENGL_FOUND "
|
|
# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
|
|
|
|
# On Apple only wxwidgets 2.9 or higher doesn't need to find aui part of base
|
|
-if(APPLE)
|
|
+EXECUTE_PROCESS(
|
|
+ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --release
|
|
+ OUTPUT_VARIABLE _wx_release
|
|
+ RESULT_VARIABLE _wx_result
|
|
+ ERROR_QUIET
|
|
+)
|
|
+IF(_wx_result EQUAL 0 AND _wx_release EQUAL "2.9" AND APPLE)
|
|
find_package(wxWidgets COMPONENTS gl adv html core net base xml QUIET)
|
|
-else(APPLE)
|
|
+else(_wx_result EQUAL 0 AND _wx_release EQUAL "2.9" AND APPLE)
|
|
find_package(wxWidgets COMPONENTS gl aui adv html core net base xml QUIET)
|
|
-endif(APPLE)
|
|
+endif(_wx_result EQUAL 0 AND _wx_release EQUAL "2.9" AND APPLE)
|
|
check_find_package_result(wxWidgets_FOUND "wxWidgets")
|
|
|
|
|
|
@@ -264,7 +270,7 @@ endif()
|
|
# make uninstall rules
|
|
#================================================
|
|
configure_file(
|
|
- "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
|
|
+ "${PROJECT_SOURCE_DIR}/CMakeModules/cmake_uninstall.cmake.in"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
|
|
IMMEDIATE @ONLY)
|
|
|