back to linux

Apps/Tuto/CMakeLists.txt

@@ -52,10 +52,10 @@ IF (CGoGN_WITH_QT)
 	target_link_libraries( tuto_orbits
 		${CGoGN_LIBS}  ${CGoGN_EXT_LIBS}  )
 
-	QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h)
-	add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui}  ${tuto_histo_moc})
-	target_link_libraries( tuto_histo
-		${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+#	QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h)
+#	add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui}  ${tuto_histo_moc})
+#	target_link_libraries( tuto_histo
+#		${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
 
 
 #	QT4_WRAP_CPP(tp_master_moc tp_master.h)

SCHNApps/CMakeLists.txt

@@ -23,12 +23,13 @@ IF(WIN32)
 		SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE})
 		link_directories( ${CGoGN_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE} )
 	ELSE()
-		SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin/)
+		SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin)
 		SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin)
 		link_directories( ${CGoGN_ROOT_DIR}/bin/${ConfigurationName} )
 	ENDIF()
 ELSE()
-	SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
+	SET(EXECUTABLE_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/bin/${CMAKE_BUILD_TYPE})
+	SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
 	link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
 ENDIF()
 
@@ -89,16 +90,16 @@ LIST(APPEND EXT_LIBS PythonQt ${PYTHON_LIBRARIES})
 
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-	LIST(APPEND CMAKE_CXX_FLAGS "-Wno-unused-local-typedefs")
+	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-Wno-unused-local-typedefs")
 endif()
 
 if(WIN32)
-	LIST(APPEND CMAKE_CXX_FLAGS "/W3")
+	SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
 else()
 	if(APPLE)
-		LIST(APPEND CMAKE_CXX_FLAGS "-Wall -fPIC -std=c++11 -Wno-deprecated -Wno-overloaded-virtual")
+		SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -std=c++11 -Wno-deprecated -Wno-overloaded-virtual")
 	else()
-		LIST(APPEND CMAKE_CXX_FLAGS "-Wall -fPIC -std=c++11")
+		SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -std=c++11")
 	endif()
 endif()