Merge pull request #425 from bilke/cmake-3-warning-fixes

Fixed some warnings under CMake 3.0.0

.travis.yml

@@ -39,9 +39,9 @@ before_install:
 
 script:
   - "pwd & mkdir build && cd build && cmake $CMAKE_ARGS .. && cmake .. && make"
-  - make test
+  - make tests
   # PetSc
-  - if [[ "$CASE" == "CLI_PETSC" ]]; then make test_mpi; fi
+  - if [[ "$CASE" == "CLI_PETSC" ]]; then make tests_mpi; fi
 
 notifications:
   email:

CMakeLists.txt

@@ -140,7 +140,9 @@ ENDIF() # OGS_BUILD_GUI
 ADD_SUBDIRECTORY( AssemblerLib )
 ADD_SUBDIRECTORY( BaseLib )
 # TODO This is a hack but we have to make sure that Boost is built first
-ADD_DEPENDENCIES(BaseLib Boost)
+IF(TARGET Boost)
+	ADD_DEPENDENCIES(BaseLib Boost)
+ENDIF()
 ADD_SUBDIRECTORY( FileIO )
 ADD_SUBDIRECTORY( GeoLib )
 ADD_SUBDIRECTORY( MathLib )

Gui/DataExplorer.cmake

@@ -97,7 +97,7 @@ IF (GEOTIFF_FOUND)
 	TARGET_LINK_LIBRARIES( ogs-gui ${GEOTIFF_LIBRARIES} )
 ENDIF () # GEOTIFF_FOUND
 
-ADD_DEPENDENCIES ( ogs-gui VtkVis OGSProject )
+ADD_DEPENDENCIES ( ogs-gui VtkVis )
 
 IF(MSVC)
 	# Set linker flags

Gui/DataView/CMakeLists.txt

@@ -198,7 +198,9 @@ target_link_libraries( QtDataView
 	shp
 )
 
-ADD_DEPENDENCIES(QtDataView VtkRescan)
+IF(TARGET VtkRescan)
+	ADD_DEPENDENCIES(QtDataView VtkRescan)
+ENDIF()
 
 IF (GEOTIFF_FOUND)
 	TARGET_LINK_LIBRARIES( QtDataView ${GEOTIFF_LIBRARIES} )

Gui/VtkAct/CMakeLists.txt

@@ -49,7 +49,10 @@ add_library( VtkAct STATIC
 	${MOC_SOURCES}
 	${UIS}
 )
-ADD_DEPENDENCIES(VtkAct VtkRescan)
+
+IF(TARGET VtkRescan)
+	ADD_DEPENDENCIES(VtkAct VtkRescan)
+ENDIF()
 
 target_link_libraries( VtkAct ${QT_LIBRARIES} )
 

Gui/VtkVis/CMakeLists.txt

@@ -152,7 +152,9 @@ ADD_LIBRARY( VtkVis STATIC
 	${UIS}
 )
 
-ADD_DEPENDENCIES(VtkVis VtkRescan)
+IF(TARGET VtkRescan)
+	ADD_DEPENDENCIES(VtkVis VtkRescan)
+ENDIF()
 
 IF (GEOTIFF_FOUND)
 	INCLUDE_DIRECTORIES( ${GEOTIFF_INCLUDE_DIRS} )

Tests/CMakeLists.txt

@@ -38,7 +38,9 @@ ENDIF()
 
 ADD_EXECUTABLE (testrunner testrunner.cpp ${TEST_SOURCES})
 SET_TARGET_PROPERTIES(testrunner PROPERTIES FOLDER Testing)
-ADD_DEPENDENCIES(testrunner Eigen)
+IF(TARGET Eigen)
+	ADD_DEPENDENCIES(testrunner Eigen)
+ENDIF()
 
 TARGET_LINK_LIBRARIES(testrunner
 	GTest
@@ -68,25 +70,23 @@ IF(OGS_BUILD_GUI)
 ENDIF()
 
 IF (QT4_FOUND)
-  TARGET_LINK_LIBRARIES(testrunner
-  	${QT_LIBRARIES}
-  )
+	TARGET_LINK_LIBRARIES(testrunner ${QT_LIBRARIES})
 ENDIF()
 
 
 # Add make-target test which runs the testrunner
 # This should override CTest's predefined test-target but it does not
 IF (OGS_USE_PETSC)
-	ADD_CUSTOM_TARGET(test
+	ADD_CUSTOM_TARGET(tests
 		mpirun -np 1 $<TARGET_FILE:testrunner> --gtest_filter=-MPITest*
 		DEPENDS testrunner
 	)
-	ADD_CUSTOM_TARGET(test_mpi
+	ADD_CUSTOM_TARGET(tests_mpi
 		mpirun -np 3 $<TARGET_FILE:testrunner>  --gtest_filter=MPITest*
 		DEPENDS testrunner
 	)
 ELSE ()
-	ADD_CUSTOM_TARGET(test
+	ADD_CUSTOM_TARGET(tests
 		$<TARGET_FILE:testrunner>
 		DEPENDS testrunner
 	)