Merge pull request #290 from peastman/master

Ensure that PYTHON_EXECUTABLE is visible to all CMake scripts

Merge pull request #290 from peastman/master
Ensure that PYTHON_EXECUTABLE is visible to all CMake scripts
dbdb7f4c · peastman · 94fd5e02 · 9e2c6b06 · dbdb7f4c · dbdb7f4c
Commit dbdb7f4c authored Jan 16, 2014 by peastman
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +2 -0

wrappers/python/CMakeLists.txt wrappers/python/CMakeLists.txt +0 -2

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,8 @@
 #   libOpenMM_static[_d].a
 #----------------------------------------------------

+find_program(PYTHON_EXECUTABLE NAMES python)
+
 # Don't create a new project name if this is part of a mega-build from the
 # parent directory
 IF( NOT PROJECT_NAME )

--- a/wrappers/python/CMakeLists.txt
+++ b/wrappers/python/CMakeLists.txt
-find_program(PYTHON_EXECUTABLE NAMES python)
-
 #############################################
 ### Copy all source files to staging area ###
 #############################################