From: Peter Johnson <peter@tortall.net>
Date: Sat, 24 May 2008 18:32:39 +0000 (-0000)
Subject: Clean up plugins CMakeLists a bit.
X-Git-Tag: v0.7.2~7^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e733283016415ea2e5b6aaee54801ec6aba903c2;p=yasm

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 fa51498b..3d4fe681 100644
--- 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 55d273d5..7f382d35 100644
--- 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"