X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=intl%2FCMakeLists.txt;h=146edfbb367820df55563f0b79ffb6e4e96559a6;hb=b436a03b3468dd15b27ee1c35e09d79b49192996;hp=f80bb67524c6921fdbb6af63f79f3c73511f2c4b;hpb=897edc10c07f5605584317376d7e909e1eba9319;p=lyx.git

diff --git a/intl/CMakeLists.txt b/intl/CMakeLists.txt
index f80bb67524..146edfbb36 100644
--- a/intl/CMakeLists.txt
+++ b/intl/CMakeLists.txt
@@ -7,8 +7,8 @@
 project(intl) 
 
 # libgnuintl.h.in => libintl.h
-configure_file(libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libgnuintl.h COPYONLY)
-configure_file(libgnuintl.h ${CMAKE_CURRENT_BINARY_DIR}/libintl.h COPYONLY)
+configure_file("${TOP_SRC_DIR}/intl/libgnuintl.h.cmake" ${CMAKE_BINARY_DIR}/intl/libgnuintl.h)
+configure_file("${TOP_SRC_DIR}/intl/libgnuintl.h.cmake" ${CMAKE_BINARY_DIR}/intl/libintl.h)
 
 
 add_definitions(
@@ -39,7 +39,7 @@ endif()
 file(GLOB intl_headers ${TOP_SRC_DIR}/intl/*.h)
 
 file(GLOB intl_sources RELATIVE "${TOP_SRC_DIR}/intl" "${TOP_SRC_DIR}/intl/*.c")
-list(REMOVE_ITEM intl_sources vasnprintf.c version.c printf-parse.c os2compat.c)
+list(REMOVE_ITEM intl_sources vasnprintf.c version.c printf-parse.c os2compat.c intl-exports.c)
 
 lyx_add_path(intl_sources ${TOP_SRC_DIR}/intl)
 
@@ -50,9 +50,16 @@ if(ICONV_FOUND)
 endif()
 
 add_library(intl STATIC ${intl_sources} ${intl_headers})
-set(LIBINTL_LIBRARIES intl)
-add_custom_target(intl_target DEPENDS intl)
 
+get_target_property(libintl_location intl LOCATION)
+set(LIBINTL_LIBRARIES ${libintl_location} CACHE STRING "libintl library" FORCE)
+
+find_path(LIBINTL_INCLUDE_DIR intl/libintl.h
+	PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH)
+	
+find_file(LIBINTL_HEADER intl/libintl.h
+	PATHS ${CMAKE_BINARY_DIR} NO_DEFAULT_PATH)
+		
 if(ICONV_FOUND)
 	target_link_libraries(intl ${ICONV_LIBRARY})
 endif()