@@ -14,7 +14,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register")
14
14
# Set up gtest. This must be set up before any subdirectories are
15
15
# added which will use gtest.
16
16
# TODO: clean this up a bit, maybe make this optional?
17
- add_subdirectory (src/ext /googletest)
18
17
include_directories (${GTEST_INCLUDE_DIRS} )
19
18
link_directories (${GTEST_LIBS_DIR} )
20
19
add_definitions ("-fPIC" )
@@ -36,19 +35,24 @@ include_directories("${PROJECT_BINARY_DIR}")
36
35
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} /bin)
37
36
set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} /lib)
38
37
39
- # This controls whether or not to build the python bridge
40
- if (BUILD_PYTHON)
41
- add_subdirectory (src/lib/python)
42
- endif ()
43
38
44
39
# add the actual code
45
40
include_directories (src/lib)
46
41
add_subdirectory (src/lib)
47
- add_subdirectory (src/programs)
48
-
49
- # Add make install functionality
50
- #install(TARGETS peval)
51
- #install(TARGETS penum)
52
- #install(TARGETS ps-colex)
53
- #install(TARGETS ps-eval)
54
- #install(TARGETS ps-lut)
42
+
43
+ # This controls whether or not we are building the python
44
+ # binaries, and possibly the wheel file.
45
+ # TODO: add a separate option for building the wheel vs. python
46
+ if (BUILD_PYTHON)
47
+ add_subdirectory (src/lib/python)
48
+ else ()
49
+ # none of these are needed in the wheel file
50
+ add_subdirectory (src/programs)
51
+ add_subdirectory (src/ext /googletest)
52
+ # Add make install functionality
53
+ install (TARGETS peval)
54
+ install (TARGETS penum)
55
+ install (TARGETS ps-colex)
56
+ install (TARGETS ps-eval)
57
+ install (TARGETS ps-lut)
58
+ endif ()
0 commit comments