Correct files to install

MapServer · Oct 6, 2018 · 612cc46 · 612cc46
1 parent 52ce27e
commit 612cc46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/mapscript/java/CMakeLists.txt b/mapscript/java/CMakeLists.txt
@@ -30,5 +30,5 @@ add_custom_command(TARGET javamapscript
                       COMMENT "Compiling java source files, creating mapscript.jar"
                       )
 
-set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_javamapscript_REAL_NAME}> $<TARGET_FILE_DIR:${SWIG_MODULE_javamapscript_REAL_NAME}>)
+set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_javamapscript_REAL_NAME}>)
 install(FILES ${mapscript_files} DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/mapscript/perl/CMakeLists.txt b/mapscript/perl/CMakeLists.txt
@@ -23,8 +23,5 @@ if(APPLE)
   set_target_properties(perlmapscript PROPERTIES SUFFIX ".bundle")
 endif(APPLE)
 
-set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_perlmapscript_REAL_NAME}> $<TARGET_FILE_DIR:${SWIG_MODULE_perlmapscript_REAL_NAME}>/mapscript.pm)
-install(FILES ${mapscript_files} DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/mapscript)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR})
-
-
+install(FILES $<TARGET_FILE:${SWIG_MODULE_perlmapscript_REAL_NAME}> DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/mapscript)
+install(FILES $<TARGET_FILE_DIR:${SWIG_MODULE_perlmapscript_REAL_NAME}>/mapscript.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR})
diff --git a/mapscript/ruby/CMakeLists.txt b/mapscript/ruby/CMakeLists.txt
@@ -21,6 +21,6 @@ if(APPLE)
     set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES SUFFIX ".bundle")
 endif(APPLE)
 
-set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_rubymapscript_REAL_NAME}> $<TARGET_FILE_DIR:${SWIG_MODULE_rubymapscript_REAL_NAME}>)
+set(mapscript_files $<TARGET_FILE:${SWIG_MODULE_rubymapscript_REAL_NAME}>)
 execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['sitearchdir']" OUTPUT_VARIABLE RUBY_SITEARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 install(FILES ${mapscript_files} DESTINATION ${RUBY_SITEARCHDIR})