Skip to content

Commit da95f89

Browse files
committed
More windows compile fixes... (allow not having qt and not having doxygen)
1 parent fc6ba4a commit da95f89

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/demos/segraph/CMakeLists.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@
3232
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
3333

3434
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED) # find and setup Qt4 for this project
35-
set(segraph_MOC_HDRS Graph.h GraphWindow.h Functions.h)
36-
set(segraph_CPPS main.cpp Graph.cpp GraphWindow.cpp Functions.cpp)
37-
qt4_wrap_cpp(segraph_MOC_SRCS ${segraph_MOC_HDRS})
38-
39-
add_executable(segraph ${segraph_CPPS} ${segraph_MOC_SRCS})
40-
install(TARGETS segraph DESTINATION demo)
41-
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
42-
target_link_libraries(segraph ${QT_QTCORE_LIBRARY})
43-
target_link_libraries(segraph ${QT_QTGUI_LIBRARY})
44-
target_link_libraries(segraph ${SEEXPR_LIBRARIES})
35+
if(QT4_FOUND)
36+
set(segraph_MOC_HDRS Graph.h GraphWindow.h Functions.h)
37+
set(segraph_CPPS main.cpp Graph.cpp GraphWindow.cpp Functions.cpp)
38+
qt4_wrap_cpp(segraph_MOC_SRCS ${segraph_MOC_HDRS})
39+
40+
add_executable(segraph ${segraph_CPPS} ${segraph_MOC_SRCS})
41+
install(TARGETS segraph DESTINATION demo)
42+
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
43+
target_link_libraries(segraph ${QT_QTCORE_LIBRARY})
44+
target_link_libraries(segraph ${QT_QTGUI_LIBRARY})
45+
target_link_libraries(segraph ${SEEXPR_LIBRARIES})
46+
endif(QT4_FOUND)

src/doc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
3333

3434
find_package(Doxygen)
35-
IF(DOXYGEN_FOUND)
35+
IF(DOXYGEN_FOUND AND NOT WIN32)
3636
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
3737
FILE(GLOB (DOCUMENTED_FILES ../lib/*.h))
3838
add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -44,4 +44,4 @@ IF(DOXYGEN_FOUND)
4444
INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION share/doc/SeExpr )
4545
INSTALL( FILES userdoc.txt DESTINATION share/doc/SeExpr/ RENAME SeExpressions.html )
4646
INSTALL( FILES Se_voronoi_1.png Se_voronoi_2.png Se_voronoi_3.png Se_voronoi_4.png Se_voronoi_5.png DESTINATION share/doc/SeExpr )
47-
ENDIF(DOXYGEN_FOUND)
47+
ENDIF(DOXYGEN_FOUND AND NOT WIN32)

0 commit comments

Comments
 (0)