diff options
| author | Peter Johnson <peter@tortall.net> | 2008-05-24 18:32:39 +0000 |
|---|---|---|
| committer | Peter Johnson <peter@tortall.net> | 2008-05-24 18:32:39 +0000 |
| commit | e733283016415ea2e5b6aaee54801ec6aba903c2 (patch) | |
| tree | 3c6154f2f1cb9dbf7a0a08c2ec26b4e9b1a56649 /plugins | |
| parent | 0a3f7ea1b9ceecd6635832924e3cd50b38e75546 (diff) | |
| download | yasm-e733283016415ea2e5b6aaee54801ec6aba903c2.tar.gz | |
Clean up plugins CMakeLists a bit.
Be more clever about finding the yasm executable on Windows.
svn path=/trunk/yasm/; revision=2103
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dbg/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | plugins/x86/CMakeLists.txt | 13 |
2 files changed, 24 insertions, 2 deletions
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" |