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

Merge branch 'dev' into coverity-fixes

Browse Source
This commit is contained in:
heckflosse
2017-06-12 18:03:54 +02:00
parent 97e558a040 a48572d577
commit 69664430e2
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/CMakeLists.txt
View File

@@ -179,7 +179,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}
@@ -225,6 +224,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)