소스 검색

BUG: Fix to find wxWidgets_LIB_DIR for windows platform more generally;
supports gcc, nmake, and visual studio in all configurations.

Miguel A. Figueroa-Villanueva 17 년 전
부모
커밋
0325639f30
1개의 변경된 파일18개의 추가작업 그리고 2개의 파일을 삭제
  1. 18 2
      Modules/FindwxWidgets.cmake

+ 18 - 2
Modules/FindwxWidgets.cmake

@@ -447,7 +447,15 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
     ENDIF(MINGW)
     ENDIF(MINGW)
     IF(BUILD_SHARED_LIBS)
     IF(BUILD_SHARED_LIBS)
       FIND_PATH(wxWidgets_LIB_DIR
       FIND_PATH(wxWidgets_LIB_DIR
-        NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg
+        NAMES
+          msw/wx/setup.h
+          mswd/wx/setup.h
+          mswu/wx/setup.h
+          mswud/wx/setup.h
+          mswuniv/wx/setup.h
+          mswunivd/wx/setup.h
+          mswunivu/wx/setup.h
+          mswunivud/wx/setup.h
         PATHS
         PATHS
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll   # prefer shared
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll   # prefer shared
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib
@@ -456,7 +464,15 @@ IF(wxWidgets_FIND_STYLE STREQUAL "win32")
         )
         )
     ELSE(BUILD_SHARED_LIBS)
     ELSE(BUILD_SHARED_LIBS)
       FIND_PATH(wxWidgets_LIB_DIR
       FIND_PATH(wxWidgets_LIB_DIR
-        NAMES msw/build.cfg mswd/build.cfg msuw/build.cfg mswud/build.cfg
+        NAMES
+          msw/wx/setup.h
+          mswd/wx/setup.h
+          mswu/wx/setup.h
+          mswud/wx/setup.h
+          mswuniv/wx/setup.h
+          mswunivd/wx/setup.h
+          mswunivu/wx/setup.h
+          mswunivud/wx/setup.h
         PATHS
         PATHS
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib   # prefer static
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib   # prefer static
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll
         ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll