Attachment #257759 for bug #349367




    dialogs/FileDlg.cpp
    dialogs/ThreeButtonDlg.cpp

    ../libltdl/ltdl.c

    adobe/adam.cpp
    adobe/adam_evaluate.cpp
    adobe/adam_parser.cpp

    )
endif ()

set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} /usr/lib/libltdl.so)
execute_process(
    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
)
set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)

set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
if (USE_DEVIL)
    list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})




########################################
# Header Generation                    #
########################################
if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
    if (UNIX)
        message("-- Configuring libltdl using \"libltdl/configure\" ...")
        execute_process(
            COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
            WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
            OUTPUT_QUIET
        )
    else ()
        file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
             "/* WARNING: Generated by GG's build system.  All local changes will be lost! */
#define error_t int
#define HAVE_STDIO_H 1
#define HAVE_STDLIB_H 1
#define HAVE_STRING_H 1
#define HAVE_CTYPE_H 1
#define HAVE_MEMORY_H 1
#define HAVE_ERRNO_H 1
#define __WIN32__
#define HAVE_MEMCPY 1
#define HAVE_MEMMOVE 1
#define LTDL_OBJDIR \".libs\"
#define LTDL_DLOPEN_DEPLIBS 1
#define LTDL_SHLIBPATH_VAR \"PATH\"
#define LTDL_SHLIB_EXT \".dll\"
"
        )
    endif ()
endif ()

configure_file(
    ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
    ${CMAKE_HOME_DIRECTORY}/GG/Config.h

Return to bug 349367

Lines 43-50 Link Here

(-)src/CMakeLists.txt (-10 / +1 lines)
43	dialogs/FileDlg.cpp	43	dialogs/FileDlg.cpp
44	dialogs/ThreeButtonDlg.cpp	44	dialogs/ThreeButtonDlg.cpp
45		45
46	../libltdl/ltdl.c
47
48	adobe/adam.cpp	46	adobe/adam.cpp
49	adobe/adam_evaluate.cpp	47	adobe/adam_evaluate.cpp
50	adobe/adam_parser.cpp	48	adobe/adam_parser.cpp
Lines 157-169 Link Here
157	)	155	)
158	endif ()	156	endif ()
159		157
160	set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1)	158	set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} /usr/lib/libltdl.so)
161	execute_process(
162	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
163	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
164	)
165	set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)
166
167	set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
168	if (USE_DEVIL)	159	if (USE_DEVIL)
169	list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})	160	list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})

Lines 224-259 Link Here

(-)CMakeLists.txt (-30 lines)
224	########################################	224	########################################
225	# Header Generation #	225	# Header Generation #
226	########################################	226	########################################
227	if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
228	if (UNIX)
229	message("-- Configuring libltdl using \"libltdl/configure\" ...")
230	execute_process(
231	COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
232	WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
233	OUTPUT_QUIET
234	)
235	else ()
236	file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
237	"/* WARNING: Generated by GG's build system. All local changes will be lost! */
238	#define error_t int
239	#define HAVE_STDIO_H 1
240	#define HAVE_STDLIB_H 1
241	#define HAVE_STRING_H 1
242	#define HAVE_CTYPE_H 1
243	#define HAVE_MEMORY_H 1
244	#define HAVE_ERRNO_H 1
245	#define __WIN32__
246	#define HAVE_MEMCPY 1
247	#define HAVE_MEMMOVE 1
248	#define LTDL_OBJDIR \".libs\"
249	#define LTDL_DLOPEN_DEPLIBS 1
250	#define LTDL_SHLIBPATH_VAR \"PATH\"
251	#define LTDL_SHLIB_EXT \".dll\"
252	"
253	)
254	endif ()
255	endif ()
256
257	configure_file(	227	configure_file(
258	${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in	228	${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
259	${CMAKE_HOME_DIRECTORY}/GG/Config.h	229	${CMAKE_HOME_DIRECTORY}/GG/Config.h