diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-19 19:56:15 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-03-19 19:56:15 +0100 |
| commit | 1542c122b3672fe83e027411ad2445772e2d0ed3 (patch) | |
| tree | e535bc621bd7ffa9d5ce89e0d495df5d1c4ab6fd /app/bin/CMakeLists.txt | |
| parent | 773810e6583142d7d15263e6481c42aebed6d7f1 (diff) | |
| parent | d1a8285f818eb7e5c3d6a05709ea21a808490b8c (diff) | |
Update upstream source from tag 'upstream/5.1.0'
Update to upstream version '5.1.0'
with Debian dir 93ca74b8b4602fce4c9c7740e0cfdde25f086673
Diffstat (limited to 'app/bin/CMakeLists.txt')
| -rw-r--r-- | app/bin/CMakeLists.txt | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/app/bin/CMakeLists.txt b/app/bin/CMakeLists.txt index ee0886d..74b1bc8 100644 --- a/app/bin/CMakeLists.txt +++ b/app/bin/CMakeLists.txt @@ -42,18 +42,6 @@ SET(LIN_SOURCES GET_TARGET_PROPERTY(genhelp_EXE genhelp LOCATION) -IF(XTRKCAD_USE_GETTEXT) - SET(GENHELP_OPTS "-bhi") - # - # Find the GnuWin32 installation directory, the gettext include should be located in subdir include - # - IF(WIN32) - ADD_DEFINITIONS(-DUSE_SIMPLE_GETTEXT ) - ENDIF(WIN32) -ELSE(XTRKCAD_USE_GETTEXT) - SET(GENHELP_OPTS "-bh") -ENDIF(XTRKCAD_USE_GETTEXT) - ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/bllnhlp.c DEPENDS genhelp ${help_SOURCE_DIR}/genhelp.in @@ -62,8 +50,11 @@ ADD_CUSTOM_COMMAND( SET(SOURCES ${LIN_SOURCES} + appdefaults.c bllnhlp.c + cbezier.c cblock.c + ccornu.c ccurve.c ccontrol.c cdraw.c @@ -115,12 +106,16 @@ SET(SOURCES elev.c fileio.c i18n.c + layout.c lprintf.c macro.c misc2.c param.c + paths.c shrtpath.c smalldlg.c + tbezier.c + tcornu.c tcurve.c tease.c track.c @@ -134,12 +129,6 @@ INCLUDE_DIRECTORIES(${XTrkCAD_BINARY_DIR}) INCLUDE_DIRECTORIES(${help_BINARY_DIR}) INCLUDE_DIRECTORIES(${wlib_SOURCE_DIR}/include) -# find libintl.h and use it -find_path ( INTL_PATH libintl.h ) -if(INTL_PATH) - INCLUDE_DIRECTORIES(${INTL_PATH}) -endif(INTL_PATH) - LINK_DIRECTORIES(${GTK_LIBRARY_DIRS}) LINK_DIRECTORIES(${GTK_WEBKIT_LIBRARY_DIRS}) @@ -149,12 +138,13 @@ ADD_LIBRARY(xtrkcad-lib ${SOURCES}) ADD_DEPENDENCIES(xtrkcad-lib Help) ADD_EXECUTABLE(xtrkcad WIN32 - misc.c + misc.c xtrkcad.rc ) TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-lib) TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-wlib) -target_link_libraries(xtrkcad dynstring) +TARGET_LINK_LIBRARIES(xtrkcad xtrkcad-cornu) +TARGET_LINK_LIBRARIES(xtrkcad dynstring) ADD_EXECUTABLE(mkturnout ${LIN_SOURCES} |