Commits

Anonymous committed 232c5fb

More fixes to the installation process. Still not perfect.

  • Participants
  • Parent commits 02e3692
  • Branches conversion-to-cmake

Comments (0)

Files changed (5)

src/CMakeLists.txt

 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-INCLUDE ("Common.cmake")
-
 SET (WML_LIB_DIR "lib/wml")
 SET (WML_DATA_DIR "${WML_LIB_DIR}/data")
+SET (WML_LIBEXE_DIR "${WML_LIB_DIR}/exec/")
+
+INCLUDE ("Common.cmake")
 
 SUBDIRS (
     wml_aux 
 MACRO(DEFINE_WML_AUX_PERL_PROG_WITHOUT_MAN BASENAME)
     PREPROCESS_PATH_PERL("preproc_${BASENAME}" "${BASENAME}.src" "${BASENAME}.pl")
     INSTALL(
-        FILES "${BASENAME}.pl"
-        DESTINATION "lib/exec/wml_aux_${BASENAME}"
+        PROGRAMS "${BASENAME}.pl"
+        DESTINATION "${WML_LIBEXE_DIR}"
+        RENAME "wml_aux_${BASENAME}"
     )
 ENDMACRO(DEFINE_WML_AUX_PERL_PROG_WITHOUT_MAN BASENAME)
 
 MACRO(DEFINE_WML_AUX_PERL_PROG BASENAME)
     DEFINE_WML_AUX_PERL_PROG_WITHOUT_MAN("${BASENAME}")
     RUN_POD2MAN("pod_${BASENAME}" "${BASENAME}.src" "${BASENAME}.1" "1" "EN  Tools" "En Tools")
-    INSTALL_MAN ("${BASENAME}.1" 1)
+    INSTALL_RENAME_MAN ("${BASENAME}.1" 1 "wml_aux_${BASENAME}")
 ENDMACRO(DEFINE_WML_AUX_PERL_PROG BASENAME)
 
 MACRO(DEFINE_WML_AUX_C_PROG_WITHOUT_MAN BASENAME)
     ADD_EXECUTABLE(${BASENAME} ${ARGN})
+    SET_TARGET_PROPERTIES("${BASENAME}" 
+        PROPERTIES OUTPUT_NAME "wml_aux_${BASENAME}"
+    )
+    MESSAGE ("BASENAME = <${BASENAME}>")
     INSTALL(
-        TARGETS ${BASENAME}
-        DESTINATION "lib/exec/wml_aux_${BASENAME}"
+        TARGETS "${BASENAME}"
+        DESTINATION "${WML_LIBEXE_DIR}"
     )
 ENDMACRO(DEFINE_WML_AUX_C_PROG_WITHOUT_MAN BASENAME)
 
 MACRO(DEFINE_WML_AUX_C_PROG BASENAME)
     DEFINE_WML_AUX_C_PROG_WITHOUT_MAN (${BASENAME} ${ARGN})
-    INSTALL_MAN ("${BASENAME}.1" 1)
+    INSTALL_RENAME_MAN ("${BASENAME}.1" 1 "wml_aux_${BASENAME}")
 ENDMACRO(DEFINE_WML_AUX_C_PROG BASENAME)
 

src/wml_aux/freetable/CMakeLists.txt

-INCLUDE ("../../Common.cmake")
-
 DEFINE_WML_AUX_PERL_PROG("freetable")

src/wml_aux/iselect/CMakeLists.txt

 SET(CMAKE_VERBOSE_MAKEFILE ON)
-INCLUDE ("../../Common.cmake")
 
 SET (CURSES_NEED_NCURSES TRUE)
 INCLUDE(FindCurses)

src/wml_aux/tidy/CMakeLists.txt

 SET(CMAKE_VERBOSE_MAKEFILE ON)
-INCLUDE ("../../Common.cmake")
 ########### next target ###############
 
 DEFINE_WML_AUX_C_PROG_WITHOUT_MAN (