Salome HOME
projects
/
tools
/
libbatch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d926e4
)
CMake: removing "TODO TODO" message now that Libbatch properly configures under Win32
author
bruneton
<bruneton>
Tue, 2 Jul 2013 09:53:49 +0000
(09:53 +0000)
committer
bruneton
<bruneton>
Tue, 2 Jul 2013 09:53:49 +0000
(09:53 +0000)
CMakeLists.txt
patch
|
blob
|
history
CMakeModules/FindLibbatchPython.cmake
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 258ca73c74737b81741125291992e59a3e17f056..4a965e034d00c81fac7ea817c9090020a4a8a026 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-69,7
+69,6
@@
IF (LIBBATCH_PYTHON_WRAPPING)
FIND_PACKAGE(LibbatchPython REQUIRED)
FIND_PACKAGE(LibbatchSWIG REQUIRED)
FIND_PACKAGE(LibbatchPython REQUIRED)
FIND_PACKAGE(LibbatchSWIG REQUIRED)
- MESSAGE("TODO TODO check Python path win32")
SET(LIBBATCH_PYTHONPATH lib/python${PYTHON_VERSION}/site-packages)
ENDIF()
SET(LIBBATCH_PYTHONPATH lib/python${PYTHON_VERSION}/site-packages)
ENDIF()
diff --git
a/CMakeModules/FindLibbatchPython.cmake
b/CMakeModules/FindLibbatchPython.cmake
index 5c18bf70aea58ab6f21ac7e19199edba681147d1..d50087ad4533b0f6f2f72a572cebc23ffe0de6a6 100644
(file)
--- a/
CMakeModules/FindLibbatchPython.cmake
+++ b/
CMakeModules/FindLibbatchPython.cmake
@@
-78,8
+78,6
@@
IF (PYTHONINTERP_FOUND)
# Prepare call to FIND_PACKAGE(PythonLibs) and ensure priority is given to
# the location found for the interpreter:
GET_FILENAME_COMPONENT(_tmp "${_python_dir}" PATH)
# Prepare call to FIND_PACKAGE(PythonLibs) and ensure priority is given to
# the location found for the interpreter:
GET_FILENAME_COMPONENT(_tmp "${_python_dir}" PATH)
-# SET(PYTHON_LIBRARY ${_tmp}/lib)
-# SET(PYTHON_INCLUDE_DIR ${_tmp}/include)
SALOME_FIND_PACKAGE(LibbatchPython PythonLibs MODULE)
# Restore variables:
SET(LibbatchPython_FIND_VERSION_EXACT ${_old_EXACT})
SALOME_FIND_PACKAGE(LibbatchPython PythonLibs MODULE)
# Restore variables:
SET(LibbatchPython_FIND_VERSION_EXACT ${_old_EXACT})