1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Fix build when upgrading from a previous version

Reported by:	Mikhail Tsatsenko <m.tsatsenko@gmail.com>
This commit is contained in:
Ganael LAPLANCHE 2013-02-23 13:47:49 +00:00
parent ddfb7520ed
commit 43b109740e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=312812
2 changed files with 11 additions and 7 deletions

View File

@ -0,0 +1,11 @@
--- CMakeLists.txt.orig 2013-02-23 10:59:16.000000000 +0100
+++ CMakeLists.txt 2013-02-23 10:59:35.000000000 +0100
@@ -327,7 +327,7 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")
-include_directories(${PROJECT_SOURCE_DIR})
+include_directories(BEFORE ${PROJECT_SOURCE_DIR})
include_directories(${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include)
include_directories(${PROJECT_BINARY_DIR}/simgear)
include_directories(${PROJECT_BINARY_DIR}/simgear/xml)

View File

@ -1,7 +0,0 @@
--- CMakeModules/SimGearComponent.cmake.orig 2013-02-21 05:58:12.000000000 +0100
+++ CMakeModules/SimGearComponent.cmake 2013-02-21 05:58:58.000000000 +0100
@@ -1,3 +1,4 @@
+include_directories(BEFORE ${PROJECT_SOURCE_DIR})
macro(simgear_component_common name includePath sourcesList sources headers)
set(fc${sourcesList} ${name})