liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with dev...

Browse Source
This commit is contained in:
Desmis
2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/CMakeLists.txt
View File

@@ -180,7 +180,6 @@ if(WIN32)
${GTKMM_LIBRARY_DIRS}
${GTK_LIBRARY_DIRS}
)
#set_target_properties(rth PROPERTIES LINK_FLAGS "-mwindows")
else()
include_directories(${EXTRA_INCDIR}
${CANBERRA-GTK_INCLUDE_DIRS}
@@ -226,6 +225,9 @@ add_dependencies(rth UpdateInfo)
add_dependencies(rth-cli UpdateInfo)
# Set executables targets properties, i.e. output filename and compile flags
if(WIN32)
set_target_properties(rth PROPERTIES LINK_FLAGS "-mwindows")
endif()
set_target_properties(rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee)
set_target_properties(rth-cli PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee-cli)