equal
deleted
inserted
replaced
109 |
109 |
110 # Check Freepascal version |
110 # Check Freepascal version |
111 find_package(Freepascal) |
111 find_package(Freepascal) |
112 |
112 |
113 if (FPC_VERSION VERSION_LESS required_fpc_version) |
113 if (FPC_VERSION VERSION_LESS required_fpc_version) |
|
114 <<<<<<< local |
114 message(FATAL_ERROR "Necessary FPC version not found (required version = ${required_fpc_version})") |
115 message(FATAL_ERROR "Necessary FPC version not found (required version = ${required_fpc_version})") |
115 else() |
116 else() |
116 message(STATUS "Found FPC: ${FPC_EXECUTABLE} (version ${FPC_VERSION})") |
117 message(STATUS "Found FPC: ${FPC_EXECUTABLE} (version ${FPC_VERSION})") |
|
118 ======= |
|
119 message(FATAL_ERROR "Freepascal is too old, minimum version required is ${required_fpc_version}") |
|
120 >>>>>>> other |
117 endif() |
121 endif() |
118 |
122 |
119 |
123 |
120 #DEPENDECIES AND EXECUTABLES SECTION |
124 #DEPENDECIES AND EXECUTABLES SECTION |
121 if(APPLE) |
125 if(APPLE) |
163 message(STATUS "Screenshots will be in BMP format per user request") |
167 message(STATUS "Screenshots will be in BMP format per user request") |
164 endif() |
168 endif() |
165 |
169 |
166 |
170 |
167 #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6 |
171 #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6 |
|
172 <<<<<<< local |
168 if(FPC_VERSION LESS "020600") |
173 if(FPC_VERSION LESS "020600") |
|
174 ======= |
|
175 if(FPC_VERSION VERSION_LESS "2.6") |
|
176 >>>>>>> other |
169 #under some configurations CMAKE_BUILD_TOOL fails to pass on the jobserver, breaking parallel compilation |
177 #under some configurations CMAKE_BUILD_TOOL fails to pass on the jobserver, breaking parallel compilation |
170 #TODO: check if this is needed on windows too |
|
171 if(UNIX) |
178 if(UNIX) |
172 set(SAFE_BUILD_TOOL $(MAKE)) |
179 set(SAFE_BUILD_TOOL $(MAKE)) |
173 else() |
180 else() |
174 set(SAFE_BUILD_TOOL ${CMAKE_BUILD_TOOL}) |
181 set(SAFE_BUILD_TOOL ${CMAKE_BUILD_TOOL}) |
175 endif() |
182 endif() |
252 if(${FFMPEG_FOUND}) |
259 if(${FFMPEG_FOUND}) |
253 add_dependencies(${engine_output_name} avwrapper) |
260 add_dependencies(${engine_output_name} avwrapper) |
254 endif() |
261 endif() |
255 |
262 |
256 #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6 |
263 #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6 |
257 if((FPC_VERSION LESS "020600") AND (NOVIDEOREC OR NOT ${FFMPEG_FOUND})) |
264 if((FPC_VERSION VERSION_LESS "2.6") AND (NOVIDEOREC OR NOT ${FFMPEG_FOUND})) |
258 add_dependencies(${engine_output_name} ENGINECLEAN) |
265 add_dependencies(${engine_output_name} ENGINECLEAN) |
259 endif() |
266 endif() |
260 |
267 |
261 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir}) |
268 install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir}) |