Skip to content

Commit c743aed

Browse files
committed
Some more changes.
1 parent c8b365a commit c743aed

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
22
project(MOOSE)
33

44
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules")
@@ -376,8 +376,8 @@ endif()
376376
install(TARGETS moose.bin DESTINATION bin CONFIGURATIONS Debug)
377377
install(TARGETS libmoose DESTINATION lib CONFIGURATIONS Debug)
378378

379-
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py --skip-build
380-
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM)"
379+
install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py install --skip-build
380+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})"
381381
CONFIGURATION Debug Release)
382382

383383
# Print message to start build process

setup.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@
3434
sdir_ = Path().absolute()
3535
builddir_ = sdir_ / '_build'
3636
builddir_.mkdir(parents=True, exist_ok=True)
37-
cmakeCacheFile_ = builddir_ / 'CMakeCache.txt'
38-
if cmakeCacheFile_.exists():
39-
cmakeCacheFile_.unlink()
40-
4137

4238
numCores_ = os.cpu_count() - 1
4339

@@ -51,8 +47,8 @@ def __init__(self, name):
5147
# don't invoke the original build_ext for this special extension
5248
super().__init__(name, sources=[])
5349

54-
class build_ext(_build_ext):
5550

51+
class build_ext(_build_ext):
5652
user_options = [
5753
('with-boost', None, 'Use Boost Libraries (OFF)'),
5854
('with-gsl', None, 'Use Gnu Scienfific Library (ON)'),

0 commit comments

Comments
 (0)