# HG changeset patch # User koda # Date 1363606209 -3600 # Node ID 671f6ef4f7f107f139f01e73b0bedf132981e72b # Parent 0c08d07e791a65e78d0dba3e2952d6af896cdf45 move paths setup inside cmake_lang files diff -r 0c08d07e791a -r 671f6ef4f7f1 cmake_modules/CMakePascalInformation.cmake --- a/cmake_modules/CMakePascalInformation.cmake Mon Mar 18 10:06:07 2013 +0100 +++ b/cmake_modules/CMakePascalInformation.cmake Mon Mar 18 12:30:09 2013 +0100 @@ -70,9 +70,10 @@ # SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) #ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP) -#IF(NOT CMAKE_INCLUDE_FLAG_Ada) -# SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C}) -#ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada) +IF(NOT CMAKE_INCLUDE_FLAG_Pascal) + #amazing, fpc: -I Add to include path + 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}) @@ -117,6 +118,9 @@ # # +if (NOT EXECUTABLE_OUTPUT_PATH) + set (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +endif (NOT EXECUTABLE_OUTPUT_PATH) # create an Ada shared library IF(NOT CMAKE_Ada_CREATE_SHARED_LIBRARY) @@ -139,7 +143,8 @@ # compile a Pascal file into an object file IF(NOT CMAKE_Pascal_COMPILE_OBJECT) - SET(CMAKE_Pascal_COMPILE_OBJECT " -Cn") + SET(CMAKE_Pascal_COMPILE_OBJECT + " -Cn -FE${EXECUTABLE_OUTPUT_PATH} -FU${CMAKE_CURRENT_BINARY_DIR} -Fi${CMAKE_CURRENT_BINARY_DIR}") #" -o -Cn ENDIF(NOT CMAKE_Pascal_COMPILE_OBJECT) @@ -174,9 +179,6 @@ IF(NOT CMAKE_Pascal_LINK_EXECUTABLE) #GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_Pascal_COMPILER}" PATH) - if (NOT EXECUTABLE_OUTPUT_PATH) - set (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) - endif() message("look here ${CMAKE_CURRENT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH}") set(CMAKE_Pascal_LINK_EXECUTABLE "${EXECUTABLE_OUTPUT_PATH}/ppas.sh") # SET(CMAKE_Pascal_LINK_EXECUTABLE "${CMAKE_Pascal_COMPILER} .adb -cargs -largs ") diff -r 0c08d07e791a -r 671f6ef4f7f1 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Mon Mar 18 10:06:07 2013 +0100 +++ b/hedgewars/CMakeLists.txt Mon Mar 18 12:30:09 2013 +0100 @@ -204,7 +204,7 @@ endif() -set(CMAKE_Pascal_FLAGS "-B -FE${PROJECT_BINARY_DIR}/bin -FU${PROJECT_BINARY_DIR}/hedgewars -vm4079,4080,4081 -Fl${PROJECT_BINARY_DIR}/bin -Fi${PROJECT_BINARY_DIR}/hedgewars -k-L${PROJECT_BINARY_DIR}/bin -Cs2000000 -vewnq -dDEBUGFILE") +set(CMAKE_Pascal_FLAGS "-B -vm4079,4080,4081 -Fl${PROJECT_BINARY_DIR}/bin -k-L${PROJECT_BINARY_DIR}/bin -Cs2000000 -vewnq -dDEBUGFILE") add_executable(hwengine hwengine.pas) if(APPLE)