[Plplot-cvs] SF.net SVN: plplot:[13045] trunk/cmake/modules/FindwxWidgets.cmake

[<phi...@us...>]

Revision: 13045
          http://sourceforge.net/p/plplot/code/13045
Author:   philrosenberg
Date:     2014-03-06 13:26:33 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
Added Workaround for finding 64 bit wxWidgets for NMake

Modified Paths:
--------------
    trunk/cmake/modules/FindwxWidgets.cmake

Modified: trunk/cmake/modules/FindwxWidgets.cmake
===================================================================
--- trunk/cmake/modules/FindwxWidgets.cmake	2014-03-06 00:05:26 UTC (rev 13044)
+++ trunk/cmake/modules/FindwxWidgets.cmake	2014-03-06 13:26:33 UTC (rev 13045)
@@ -509,15 +509,30 @@
   #message(STATUS "MSVC_C_ARCHITECTURE_ID = ${MSVC_C_ARCHITECTURE_ID}")
   #message(STATUS "MSVC_CXX_ARCHITECTURE_ID = ${MSVC_CXX_ARCHITECTURE_ID}")
   #message(STATUS "CMAKE_CL_64 = ${CMAKE_CL_64}")
+  #message(STATUS "LIB = $ENV{LIB}")
+  #message(STATUS "GENERATOR = ${CMAKE_GENERATOR}")
   if(WX_ROOT_DIR)
     # Select one default tree inside the already determined wx tree.
     # Prefer static/shared order usually consistent with build
     # settings.
     if(MINGW)
       set(WX_LIB_DIR_PREFIX gcc)
+    #The following should check for compiling 64 bit with nmake or VS
     #Check for use of 64 bit NMake Makefile generator or a Visual Studio XX Win64 generator
-    elseif(CMAKE_CL_64 OR ${CMAKE_GENERATOR} MATCHES "Win64$")
+    elseif(CMAKE_CL_64)
       set(WX_LIB_DIR_PREFIX vc_x64)
+    #unfortunately the above doesn't work on my system - can't find why, but workaround below
+    #Check for vs64 bit
+    elseif(${CMAKE_GENERATOR} MATCHES "Win64$")
+      set(WX_LIB_DIR_PREFIX vc_x64)
+    #Check for nmake 64 bit
+    elseif(${CMAKE_GENERATOR} STREQUAL "NMake Makefiles")
+      set(WX_LIB_DIR_PREFIX vc)
+      foreach(ENVLIBDIR $ENV{LIB})
+        if( ENVLIBDIR MATCHES "amd64$")
+          set(WX_LIB_DIR_PREFIX vc_x64)
+        endif()
+      endforeach()
     else()
       set(WX_LIB_DIR_PREFIX vc)
     endif()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.