cmake_modules/CMakePascalInformation.cmake
branchcmake_pascal
changeset 8758 cb3b470f1000
parent 8756 671f6ef4f7f1
child 8770 53481d654691
--- a/cmake_modules/CMakePascalInformation.cmake	Mon Mar 18 12:30:09 2013 +0100
+++ b/cmake_modules/CMakePascalInformation.cmake	Mon Mar 18 16:38:46 2013 +0100
@@ -75,9 +75,9 @@
   SET(CMAKE_INCLUDE_FLAG_Pascal ${CMAKE_INCLUDE_FLAG_C})
 ENDIF(NOT CMAKE_INCLUDE_FLAG_Pascal)
 
-#IF(NOT CMAKE_INCLUDE_FLAG_SEP_Ada)
-#  SET(CMAKE_INCLUDE_FLAG_SEP_Ada ${CMAKE_INCLUDE_FLAG_SEP_C})
-#ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_Ada)
+IF(NOT CMAKE_INCLUDE_FLAG_SEP_Pascal)
+  SET(CMAKE_INCLUDE_FLAG_SEP_Pascal ${CMAKE_INCLUDE_FLAG_SEP_C})
+ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_Pascal)
 
 # Copy C version of this flag which is normally determined in platform file.
 IF(NOT CMAKE_SHARED_LIBRARY_SONAME_Pascal_FLAG)
@@ -144,7 +144,7 @@
 # compile a Pascal file into an object file
 IF(NOT CMAKE_Pascal_COMPILE_OBJECT)
   SET(CMAKE_Pascal_COMPILE_OBJECT
-      "<CMAKE_Pascal_COMPILER> <FLAGS> <SOURCE> -Cn -FE${EXECUTABLE_OUTPUT_PATH} -FU${CMAKE_CURRENT_BINARY_DIR} -Fi${CMAKE_CURRENT_BINARY_DIR}")
+      "<CMAKE_Pascal_COMPILER> -Cn -FE${EXECUTABLE_OUTPUT_PATH} -FU${CMAKE_CURRENT_BINARY_DIR}/<OBJECT_DIR> -Fi${CMAKE_CURRENT_BINARY_DIR} <FLAGS> <SOURCE>")
 #"<CMAKE_Pascal_COMPILER> <FLAGS> <SOURCE> -o<OBJECT> -Cn
 ENDIF(NOT CMAKE_Pascal_COMPILE_OBJECT)