Clean up plugins CMakeLists a bit.

Be more clever about finding the yasm executable on Windows.

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

diff --git a/plugins/dbg/CMakeLists.txt b/plugins/dbg/CMakeLists.txt
index fa51498bb814d4f5d5cc6eef6ea208dd1cd78850..3d4fe681549409e35557868aa473d4df4a04b2e9 100644 (file)
--- a/plugins/dbg/CMakeLists.txt
+++ b/plugins/dbg/CMakeLists.txt
@@ -1,4 +1,15 @@
-FIND_PROGRAM(YASM_PATH yasm)
+PROJECT(dbgmod)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
+SET (YASM_POSSIBLE_PATHS
+    "$ENV{ProgramFiles}/Yasm/Bin"
+    /usr/bin
+    /usr/local/bin
+    )
+
+FIND_PROGRAM(YASM_PATH yasm
+    PATHS ${YASM_POSSIBLE_PATHS}
+    )
 
 SET (YASM_POSSIBLE_INCLUDE_PATHS
     "${YASM_PATH}"

diff --git a/plugins/x86/CMakeLists.txt b/plugins/x86/CMakeLists.txt
index 55d273d5b75c11369dead5004d9a49768527a438..7f382d35608aa26d1883e15c4e56d9238641551f 100644 (file)
--- a/plugins/x86/CMakeLists.txt
+++ b/plugins/x86/CMakeLists.txt
@@ -1,6 +1,17 @@
+PROJECT(x86mod)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
 SET(SOURCE_DIR "${YASM_SOURCE_DIR}/modules/arch/x86")
 
-FIND_PROGRAM(YASM_PATH yasm)
+SET (YASM_POSSIBLE_PATHS
+    "$ENV{ProgramFiles}/Yasm/Bin"
+    /usr/bin
+    /usr/local/bin
+    )
+
+FIND_PROGRAM(YASM_PATH yasm
+    PATHS ${YASM_POSSIBLE_PATHS}
+    )
 
 FIND_PROGRAM(GENPERF_PATH genperf
     DOC "The path to the yasm genperf executable"