anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: CMAKE_SOURCE_DIR has changed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38612 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2011-05-07 11:55:06 +00:00
parent 8f993bfcf1
commit 0ba6efb073
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/cmake/CMakeLists.txt
View File

@ -372,8 +372,8 @@ if(LYX_PCH)
# PCHs not supported by cmake: http://www.cmake.org/Bug/view.php?id=1260 # PCHs not supported by cmake: http://www.cmake.org/Bug/view.php?id=1260
# Not sure if it works for all non-msvc compilers # Not sure if it works for all non-msvc compilers
include(PCHSupport_26) include(PCHSupport_26)
configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h ${TOP_BINARY_DIR}/pcheaders.h) configure_file(${TOP_SRC_DIR}/development/cmake/pcheaders.h ${TOP_BINARY_DIR}/pcheaders.h)
configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake ${TOP_BINARY_DIR}/config_pch.cpp) configure_file(${TOP_SRC_DIR}/development/cmake/config.cpp.cmake ${TOP_BINARY_DIR}/config_pch.cpp)
add_definitions(-DLYX_ENABLE_PCH) add_definitions(-DLYX_ENABLE_PCH)
if(MSVC) if(MSVC)

2
development/cmake/src/CMakeLists.txt
View File

@ -91,7 +91,7 @@ if (LYX_VLD)
endif() endif()
if(WIN32) if(WIN32)
set(FILE_RC ${CMAKE_SOURCE_DIR}/lyx.rc) set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc)
message(STATUS "Using icon defined in resource file: ${FILE_RC}") message(STATUS "Using icon defined in resource file: ${FILE_RC}")
endif() endif()