Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set directories to be included externally, in the project file cmake_pascal
authorkoda
Tue, 26 Mar 2013 01:13:45 +0100
branchcmake_pascal
changeset 8846 c156ac6ddc2b
parent 8843 843a9a405542
child 8849 db108c851315
set directories to be included externally, in the project file
cmake_modules/CMakePascalInformation.cmake file | annotate | diff | comparison | revisions
hedgewars/CMakeLists.txt file | annotate | diff | comparison | revisions 
--- a/cmake_modules/CMakePascalInformation.cmake	Sun Mar 24 11:11:39 2013 +0100
+++ b/cmake_modules/CMakePascalInformation.cmake	Tue Mar 26 01:13:45 2013 +0100
@@ -176,7 +176,7 @@
     endif(UNIX)
 
     set(CMAKE_Pascal_COMPILE_OBJECT
-        "<CMAKE_Pascal_COMPILER> -Cn -FE${EXECUTABLE_OUTPUT_PATH} -FU${CMAKE_CURRENT_BINARY_DIR}/<OBJECT_DIR> -Fi${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_Pascal_UNIX_FLAGS} <FLAGS> <SOURCE>")
+        "<CMAKE_Pascal_COMPILER> -Cn -FE${EXECUTABLE_OUTPUT_PATH} -FU${CMAKE_CURRENT_BINARY_DIR}/<OBJECT_DIR> ${CMAKE_Pascal_UNIX_FLAGS} <FLAGS> <SOURCE>")
 endif(NOT CMAKE_Pascal_COMPILE_OBJECT)
 
 # link Pascal objects in a single executable
--- a/hedgewars/CMakeLists.txt	Sun Mar 24 11:11:39 2013 +0100
+++ b/hedgewars/CMakeLists.txt	Tue Mar 26 01:13:45 2013 +0100
@@ -12,6 +12,7 @@
 
 enable_language(Pascal)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.inc.in ${CMAKE_CURRENT_BINARY_DIR}/config.inc)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if (APPLE)
     set(required_fpc_version 2.6)
hedgewars