From 42dba75497cf1479cddcd331c7ee778b877b63bf Mon Sep 17 00:00:00 2001 From: don bright Date: Wed, 23 Sep 2015 18:22:15 -0700 Subject: [PATCH] add convenience search for openscad binary under openscad/bin/openscad --- tests/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 866c4a06..ef7e429d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -847,10 +847,10 @@ elseif (MINGW_CROSS_ENV_DIR) set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../mingw32/release/openscad.exe") elseif(WIN32) set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../Release/openscad.exe") -elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR/../openscad}") +elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../bin/openscad") + set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../bin/openscad") +else() set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/../openscad") -elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR/../bin/openscad}") - set(OPENSCAD_BINPATH "${CMAKE_CURRENT_SOURCE_DIR}/bin/openscad") endif() if(EXISTS "${OPENSCAD_BINPATH}")