Fix x86 plugin build on Windows.

svn path=/trunk/yasm/; revision=2104

diff --git a/plugins/x86/CMakeLists.txt b/plugins/x86/CMakeLists.txt
index 7f382d35608aa26d1883e15c4e56d9238641551f..d0e10daefa6ca069ca93d7ba3c32f961ee4dc985 100644 (file)
--- a/plugins/x86/CMakeLists.txt
+++ b/plugins/x86/CMakeLists.txt
@@ -1,6 +1,13 @@
 PROJECT(x86mod)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
+SET(YASM_SOURCE_DIR "${PROJECT_SOURCE_DIR}/../.."
+    CACHE STRING "Location of Yasm source")
+
+IF (NOT YASM_SOURCE_DIR)
+    MESSAGE(FATAL_ERROR "YASM_SOURCE_DIR must be defined")
+ENDIF (NOT YASM_SOURCE_DIR)
+
 SET(SOURCE_DIR "${YASM_SOURCE_DIR}/modules/arch/x86")
 
 SET (YASM_POSSIBLE_PATHS
@@ -13,9 +20,15 @@ FIND_PROGRAM(YASM_PATH yasm
     PATHS ${YASM_POSSIBLE_PATHS}
     )
 
+SET (GENPERF_POSSIBLE_PATHS
+    ${YASM_SOURCE_DIR}/objdir/tools/genperf
+    ${YASM_SOURCE_DIR}/objdir/tools/genperf/Debug
+    ${YASM_SOURCE_DIR}/objdir/tools/genperf/Release
+    )
+
 FIND_PROGRAM(GENPERF_PATH genperf
     DOC "The path to the yasm genperf executable"
-    PATHS ${YASM_SOURCE_DIR}/objdir/tools/genperf
+    PATHS ${GENPERF_POSSIBLE_PATHS}
     )
 
 IF (NOT GENPERF_PATH)
@@ -63,6 +76,10 @@ ENDIF (NOT YASM_LIBRARY)
 
 INCLUDE(FindPythonInterp)
 
+IF (NOT PYTHON_EXECUTABLE)
+    MESSAGE(FATAL_ERROR "Could not find Python executable")
+ENDIF (NOT PYTHON_EXECUTABLE)
+
 INCLUDE_DIRECTORIES(${SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})